Merge branch 'master' into develop
[#31] Clean up wording in index and about_me

* Comments added to script quarantine code
  in controller to admit weakness of code.
Merge branch 'task-31-fix_wording_in_index_and_about_me' into develop
Merge branch 'develop'