Updated variables and added resize functionality.
Merge branch 'master' of https://github.com/KrisCheesman/Group

Conflicts:
	ms.c