random nonsense
Merge branch 'master' of https://github.com/GitCrnchber/Rebels_Timer_2

Conflicts:
	Rebels_Timer_2.userprefs
	Rebels_Timer_2/bin/iPhoneSimulator/Debug/Rebels_Timer_2.exe
	Rebels_Timer_2/bin/iPhoneSimulator/Debug/Rebels_Timer_2.exe.mdb
jasdlfa