Adding the team info
Merge branch 'master' of http://Github.com/thebravoman/software_engineering_2013