no changes
added basic styling to index page
updated styles to index page
edited styles
updated styles
added hifi styling to index
Merge branch 'celeration'
Merge branch 'master' of https://github.com/gregarious/lilypad-plea
commented out lilypad styling
resolved merge conflicts
updated styles
Merge branch 'master' into celeration

Conflicts:
	app/index.html