Initialize app from template
simple push
Updating merge conflicts

Conflicts:
	README.md
	application.js
	lib/send.js
Display timestamps in logs