celsius
Merge branch 'master' of https://github.com/lineker/cassandraHackathon

Conflicts:
	Backend/src/main/java/com/model/CassandraModel.java