Finished client, might not be final
Merge branch 'master' of github.com:Vi1i/GVSU