Added some button functionality
Merge remote-tracking branch 'origin/master'

Conflicts:
	CSC484_Assignment2.csproj