Starting with push notifications
Merge branch 'release/0.0.5' into development
Made a change in master. Switching to dev
Merge branch 'master' into development
Merge branch 'development' into feature/notifications
Added a bunch of stuff...
Merge branch 'feature/notifications' into development
Bump version number
Merge branch 'release/0.0.6'
Merge branch 'release/0.0.6' into development
Notifications are a go
Bump version. Tweak welcome.html.erb
Merge branch 'release/0.0.7'
Merge branch 'release/0.0.7' into development
Fix javascript prob
Merge branch 'development'