init
git ignore update
Merge branch 'master' of github.com:andrewdanks/wiggle

Conflicts:
	.gitignore