second commit
Merge branch 'master' of https://github.com/rufuszhu/T9

Conflicts:
	app/index.html
	app/js/controllers.js
second commit