no dat nib no storyboard

before sleep
Merge branch 'master' of https://github.com/Smillence/xoxo

Conflicts:
	xoxo.xcodeproj/project.pbxproj
	xoxo/RootViewController.swift