added stuff to home.js and app.js
Merge branch 'master' of https://github.com/thomasythuang/redesignu

Conflicts:
	js/home.js