Initial commit
Merge branch 'master' of https://github.com/daviwie/sepm_ws2014.git