Renamed file name.
Merge branch 'heroku/master'

Conflicts:
	index.js