Soldiers data structures set up.  Malloc working correctly for array of button structures
Merge branch 'master' of https://github.com/benClar/COMS1201

Conflicts:
	Maze/.compiled/maze
	Maze/maze.c