Begin Again
Merge branch 'gh-pages' of https://github.com/jasonwang67/BaronUp into gh-pages

Conflicts:
	index.html
	main.css