my second commit
Merge branch 'master' of https://github.com/yoshi161/YosiLiveLesson

Conflicts:
	app/assets/stylesheets/hoho.css
my update on couples of db migration