changed from c after server has conflict
Merge branch 'master' of https://github.com/ravirsi/Matrix.git

Conflicts:
	c.txt