moved some stuff to footer and floated navbar right
fixed merge error in schema.rb
Merge branch 'master' of https://github.com/staxworks/maximilian-the-dog