init
2nd
Merge git://github.com/thomhastings/c0ntempt

Conflicts:
	.gitignore