Worked a bit on sword, got flu :'(
Merge branch 'master' of https://github.com/Gizmmo/legendOfEd