More css
Merge branch 'master' of https://github.com/kunshao/EECS498

Conflicts:
	fqueryApp/templates/home/home.html
more css
Merge branch 'master' of https://github.com/kunshao/EECS498