Fixing things
Merge branch 'develop'

Conflicts:
	.DS_Store
Adding things
Adding stuff`