Minor changes
Merge branch 'master' of git://github.com/siejen/2014WDI_SuperGrp into dev
update from team
bug fixes
Merge branch 'dev' of https://github.com/SalamanderMike/2014WDI_SuperGrp into dev

Recombining my dev
Merge branch 'master' of git://github.com/Siejen/2014WDI_SuperGrp into dev

merging group changes
Set up home page
Merge pull request #28 from SalamanderMike/master

Set up home page