Gemfile stuff
Added secret token stuff
Fixed secure tokens
Generated static pages
Changed views from haml to erb
Something changed in schema.rb
Merge branches 'static-pages' and 'master'