Back to the Basics
Merge branch 'master' of https://github.com/ElijahVazquez/undertone

Conflicts:
js/dropScripts.js
Merge branch 'master' of https://github.com/ElijahVazquez/undertone