Add models
Merge schema.rb and routes.rb
Merge branch 'development' of github.com:woohoou/angelhack into development