update gitignore
Merge remote-tracking branch 'origin/eliteFour'

Conflicts:
	Wired In.xcodeproj/project.xcworkspace/xcuserdata/caleb.xcuserdatad/UserInterfaceState.xcuserstate