--
Merge branch 'master' of https://github.com/chiarafelice/twitterlite-frontend-angularjs

Conflicts:
	src/js/controllers.js
working on clickable usernames + hashags
Merge branch 'master' of https://github.com/chiarafelice/twitterlite-frontend-angularjs

Conflicts:
	src/js/controllers.js