Second commit
Merge branch 'master' of github.com:Leeibrah/magna