schema
Merge branch 'master' of https://github.com/melezhik/pjam-on-rails
update todo list
Merge branch 'master' of https://github.com/melezhik/pjam-on-rails