Merge branch 'master' of /Users/matthewmcguire/Documents/MSUD/Fall_14/CS_390/Spotr with conflicts.
Parsed Twitter JSON objects and added as row to DB, UNTESTED