Revert "Task 1"

This reverts commit 2c0ca6fed57132674021700ee3cf23cc973bcf20.
Merge branch 'master' of https://github.com/thebravoman/software_engineering_2013
Merge branch 'master' of https://github.com/thebravoman/software_engineering_2013