For merging purposes
Merge branch 'master' of https://github.com/DrJid/Scripts

Conflicts:
	Scripts/Base.lproj/Main.storyboard