Fix conflict in apply.html
Merge branch 'master' of https://github.com/mhkane/PeaceCorps_Opportunities