git crap
git fix
git crap
Merge branch 'master' of https://github.com/carbamide/Einstein

Conflicts:
	_Build_/Xcode4/Einstein.xcodeproj/project.xcworkspace/xcuserdata/jbarrow.xcuserdatad/UserInterfaceState.xcuserstate
Add reasonable gitignore