First test commit

LOLOLOLOL
noooooB
hehe
Merge branch 'master' of https://github.com/johnljoterud/Client-test into johnljoterud-master
Merge branch 'johnljoterud-master'