getting stuff i hope
Merge branch 'fixed'

Conflicts:
	.DS_Store
ughhh
Merge branch 'newbranch'

Conflicts:
	.DS_Store