add deals page
Merge branch 'master' of https://github.com/chenyork/Transformers

Conflicts:
	app/index.html
	app/styles/main.css
	app/views/main.html
	bower.json
work on the ng-grid