hope this doesn't break
Merge branch 'master' of https://github.com/javon27/rsi_hackaton_2014

Conflicts:
	css/main.css
	index.html