fixed main file
Merge branch 'master' into clean_up

* master:
  added footer
removed underscore
added basic some basic styles
added holiday alert
Merge branch 'clean_up'

* clean_up:
  added holiday alert
  added basic some basic styles
  removed underscore
  fixed main file