resolve conflict. app now working ok. just need to remove which
	part not needed.
	new file:   app/views/login.html
	modified:   .gitignore
	modified:   Gruntfile.js
	modified:   app/index.html
	modified:   app/scripts/app.js
	modified:   app/scripts/controllers/main.js
	modified:   app/styles/main.css
	modified:   app/views/main.html
	modified:   bower.json
	modified:   package.json
	modified:   server/index.js
	modified:   server/models/users.js
Merge branch 'master' of https://github.com/kuntau/tudu