cleaned up some stuff
Merge branch 'master' into add_stuff

* master:
  added footer
more cleanup
added alert
Merge branch 'add_stuff'

* add_stuff:
  added alert
  more cleanup
  cleaned up some stuff