Merge branch 'development'

Conflicts:
	src/Makefile
	src/fpsgenie.c
	src/game.h
	src/user.c
	src/user.h
Merge branch 'master' of github.com:drphitheta/fpsgenie

Conflicts:
	src/game.h