commit before merge
Merge branch 'master' of https://github.com/darkzin/shakehand

Conflicts:
	db/development.sqlite3
before commit
edit table css and others