8 Commits

Author	SHA1	Message	Date
Rushil Umaretiya	7ba766d3f5	Auto stash before merge of "master" and "origin/master"	2020-10-20 20:38:14 -04:00
Praneeth Bhandaru	ff29d47eef	Fixed more merge issues (all of them hopefully)	2020-10-20 15:35:11 -04:00
Praneeth Bhandaru	54a6880f98	Fixed Merge Issues	2020-10-20 15:19:55 -04:00
Rushil Umaretiya	516406e48d	fixed spacing and anim	2020-10-20 15:15:54 -04:00
Praneeth Bhandaru	b73b6ea6df	Added basic News Psuedocode	2020-10-20 15:10:30 -04:00
Praneeth Bhandaru	d8a7f7fe81	Added linking to other pages	2020-10-20 10:02:52 -04:00
Rushil Umaretiya	042d103de6	added basic pages structure and looks	2020-10-19 21:38:55 -04:00
Rushil Umaretiya	77dc9138a8	started site	2020-10-19 15:42:45 -04:00