Merge branch 'fall_2014_career_fair'