last version
home work
Merge branch 'master' of heroku.com:radiant-bastion-8495

Conflicts:
	.idea/workspace.xml
	public/js/controllers.js