First Commit
not important
Merge branch 'master' of https://github.com/matrinox/SkyRocket

Conflicts:
	.DS_Store
Delete DS_Store