add rvmrc file
Update .gitignore
try to ignore ds_store
Merge branch 'master' of https://github.com/petrachi/Space
Merge branch 'master' into space_101

Conflicts:
	.gitignore