Initial setup
Merge branch 'master' of github.com:Phobos98/phobos98

Conflicts:
	.gitignore