local changes
resolved conflicts
removal of index2.js
addition of heroku
Merge pull request #17 from KodeIV/naomiEdits

Naomi edits