preparing database
Merge branch 'development'
Merge branch 'development'
initial bootstrap
small branch just to add subscriptions
switched erb to haml for application layout