Test
Initial commit
fixed merge errors from new repo
Merge branch 'master' of heroku.com:letspin

Conflicts:
	.gitignore
	README.md