initial bootstrap
added twitter bootstrap gem
small branch just to add subscriptions
switched erb to haml for application layout
Merge branch 'bootstrap' into development
merged initial bootstrap branch
devise
first conflict resolution
latest update
latest changes'
added feedjira gem
subscription scaffold