ignore ds_store
Merge branch 'master' of https://github.com/Mukealicious/mukealicious.github.com

Conflicts:
	.DS_Store