tried to add text... didn't work
Merge branch 'gh-pages' of https://github.com/angelabair/HackRPI-2014 into gh-pages

Conflicts:
	preferences.html
 screwed up