Initial commit
Merge branch 'master' of github.com:Diamond/fivePrism

Conflicts:
	.gitignore