Recommit Old Project
Merge branch 'master' of https://github.com/RedVelvet/Critik

Conflicts:
	OldProject/Presentation
Feedback.xcodeproj/project.xcworkspace/xcuserdata/ddecker2010.xcuserdata
d/UserInterfaceState.xcuserstate