removed useless files
Merge branch 'master' of https://github.com/johnprock/313

Conflicts:
	.gitignore