Adding files!
Merge branch 'master' of https://github.com/Bujiraso/Protista

Conflicts:
	.gitignore