adding stuff
Merge branch 'master' of github.com:DrJid/Scripts

Conflicts:
	Scripts/Base.lproj/Main.storyboard