All view controllers implemented
Merge branch 'master' of https://github.com/iColtonAnglin/YouthEast-App

Conflicts:

Build/Intermediates/YouthEast.build/Debug-iphonesimulator/YouthEast.buil
d/Objects-normal/i386/FGAnnotation.d

Build/Intermediates/YouthEast.build/Debug-iphonesimulator/YouthEast.buil
d/Objects-normal/i386/FGAnnotation.dia

Build/Intermediates/YouthEast.build/Debug-iphonesimulator/YouthEast.buil
d/Objects-normal/i386/FGAnnotation.o

Build/Intermediates/YouthEast.build/Debug-iphonesimulator/YouthEast.buil
d/Objects-normal/i386/FGAnnotationView.d

Build/Intermediates/YouthEast.build/Debug-iphonesimulator/YouthEast.buil
d/Objects-normal/i386/FGAnnotationView.dia

Build/Intermediates/YouthEast.build/Debug-iphonesimulator/YouthEast.buil
d/Objects-normal/i386/FGAnnotationView.o