Marina#6

Open

marinamarina wants to merge 6 commits intomasterfrom

Commits on Dec 19, 2013

Server GUI designed
marinamarina
committed
Delete .gitignore~
Marina Shchukina
committed
Server GUI initialises
marinamarina
committed
Merge branch 'marina' of https://github.com/Code-Crunch/CM3033 into marina
marinamarina
committed
cannot change branches without commiting...
FlorinMazilu
committed
Small Updates, BPM requires vague redesign...
sam.cusson@hotmail.co.uk
committed