fixing gitignore
adding JS Runtime to gemfile
adding devise key
updating ruby to 2.1.3
Merge branch 'master' of https://github.com/bahartmann/trampolim into production

Conflicts:
	.gitignore
	Gemfile