started on the discussion. Dont be to critical, it will be better :)
Merge branch 'master' of https://github.com/mathilwa/Master2013