comment in siid file
solved conflicts
soled conflit
Merge branch 'master' of https://github.com/jhofer/walapp

Conflicts:
	db/seeds.rb
Merge pull request #5 from jhofer/master

no changes