Initial Commit
screw you github
back to normal
Merge branch 'cah'

Conflicts:
	app.js
starting point
Merge branch 'master' of https://github.com/smilli/contact

 especially if it merges an updated upstream into a topic branch.