Add Procfile to deploy to Heroku
Merge pull request #10 from ryojiosawa/travis

Update .travis.yml to setup Travis for GlobalView project
Merge pull request #12 from ryojiosawa/heroku

Add Procfile to deploy app to Heroku
Turn off ititiateMovement() - stops drifting on main page and fixes scroll bug on city pages
Merge pull request #14 from ceg1236/feat/moveless

Turn off ititiateMovement() - stops drifting on main page and fixes scroll bug on city pages
Adding Yelp as an option. Doesn't work yet, but nothing breaks
Externalize twitter and instagram API configs
Merge branch 'master' of https://github.com/mountain-device/Global-View into heroku

Conflicts:
	.gitignore
Externalize Twitter and Instagram API config values
Remove .env file
Remove .env file
Update .gitignore to ignore .env file
Yelp API integration. Returns city restaurants data
removing console log messages
Merge pull request #19 from ryojiosawa/heroku

Add config file and externalize Twitter and Instagram API config values to deploy to Heroku
Merge pull request #18 from suprbh/master

Adding Yelp as an option. Doesn't work yet, but nothing breaks
Remove node v0.10 in Travis