initial commit
Merge branch 'master' of github.com:dabobert/freetonight

Conflicts:
	.gitignore