hotfixed a bunch of crap, ugly code
updated changes on non-index pages
Merge branch 'master' of hackru.org:~/website
Adding adafruit logo to sponsors page.
Merge pull request #16 from jmatth/add_adafruit

Adding adafruit logo to sponsors page.
Merge branch 'master' of github.com:GRardB/HackRU
Merge branch 'master' of usacs.rutgers.edu:~/website
Changing time of Windows 8 installfest.
Merge branch 'master' of vverma.net:~/website
added parking info
Merge pull request #17 from mannyjl625/master

HackRU- updated with parking info
Merge branch 'master' of github.com:GRardB/HackRU
added links to nav bar. made prizes page
changed layout to match sponsors page
fixed nav bar layout issue
took out old workshop layout
removed parking.txt
Adding the room name to Diretions page
Merge branch 'master' of https://github.com/mannyjl625/HackRU into mannyjl625-master

Conflicts:
	stylesheets/style.css
Changing the prizes to be better at the game.