Don't even remember what I was doing.
Merge branch 'master' of https://github.com/MyKungFuIsGood/angular-todo

Conflicts:
	public/assets/js/main.js