bundling for heroku
Merge branch 'master' of github.com:psousa/todolist

Conflicts:
	Gemfile