Merge branch 'master' of https://github.com/bloomjm/upMonth

Conflicts:
css/index.css
index.html
20140213234902