Initial commit
Merge branch 'master' of https://github.com/tonsmets/SM-TE31

Stupid conflict. I'm new to this :P

Yeah I have no f#cking idea what's going wrong