First commit
Merge branch 'master' of github.com:ZeusWPI/Saruman

Conflicts:
	.gitignore