initial commit
Merge branch 'master' of github.com:hexode/first-app

Conflicts:
	.gitignore
	app.js
	package.json