git ignore
Removed bin and obj
Merge remote-tracking branch 'origin/master'

Conflicts:
	RockOfflineSite/Content/RockOfflineInit.js