initaly mixed crysatl and updated readme
Merge branch 'master' of git://github.com/samthebeer/group2-complabs