added view controllers
Storyboard
Merge branch 'master' of https://github.com/adrnswanberg/gEDin
"Fixed merge bullshit"
Conflicts:
	gEDin/gEDin.xcodeproj/project.pbxproj