map: check, map with school: check
Merge branches 'gh-pages', 'maptime' and 'master' of https://github.com/soyxango/smarterschoolsga
Merge branch 'gh-pages' of github.com:soyxango/smarterschoolsga into gh-pages

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'gh-pages' of github.com:soyxango/smarterschoolsga into gh-pages

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
late night changes
bye bar
work
img shit
Pushing dev index for parallax landing page