badge in progress
fixed code issues
Added badges to profile
Merge branch 'master' of github.com:IDeaSCo/rockstar

Conflicts:
	RockStar.iml