implemented job form for the third time
brought back the xcodeproj
hopefully fixed the merge conflicts
pre pull
pre pull 2
pre pull 3
it's 2:33 am
merging