stuff

Signed-off-by: Peter Mårtensson <veritas.is.me@gmail.com>
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	Boxia.v11.suo
	Debug/Boxia.ilk

Signed-off-by: Peter Mårtensson <veritas.is.me@gmail.com>
updates

Signed-off-by: Peter Mårtensson <veritas.is.me@gmail.com>