Inb4 mergeconflict.
Merge branch 'master' of github.com:Gluestick/xna1