initial commit
Merge branch 'master' of https://github.com/pnw/TwentyFiveFive

Conflicts:
	.gitignore
initial merge conflicts on .gitignore