team 5's stuff
Merge branch 'master' of https://github.com/Mattieuga/CodeNow-May2014
Merge branch 'master' of https://github.com/Mattieuga/CodeNow-May2014
Merge branch 'master' of https://github.com/Mattieuga/CodeNow-May2014