soled conflit
Merge branch 'master' of https://github.com/jhofer/walapp

Conflicts:
	db/seeds.rb