Early morning commit
task1
Last time I swear
Merge branch 'master' of https://github.com/thebravoman/software_engineering_2013
Merge branch 'patch-1' of https://github.com/IvanZorov/software_engineering_2013