Adding everything.
Merge branch 'master' of github.com:jamsajones/jeckle

Conflicts:
	.gitignore