Not sure what this is...

???
Merge branch 'jmwhicke/controllers'

Conflicts:
	Wheres_Miley.xcodeproj/project.pbxproj

Wheres_Miley.xcodeproj/project.xcworkspace/xcshareddata/Wheres_Miley.xcc
heckout
Merge remote-tracking branch 'origin/master' into jmwhicke/controllers
Fixed parser error.