asdflkjksdlfj
Merge branch 'master' of https://github.com/gwicke/testreduce

Conflicts:
	CassandraBackend.js
Merge branch 'master' of https://github.com/gwicke/testreduce
merge
Merge branch 'master' of https://github.com/gwicke/testreduce
my merge
Merge branch 'master' of https://github.com/gwicke/testreduce
scaffold for getTitle
rebase should be done
conflict resolution
completed mock statistics, generated results and tables for the intro page
fixed merge conflicts, set up mockdata.js, connected with the CassandraBackend, generated mock statistics in HTML
fixed some bugs in CassandraBackend.js, in particular the bindings and the typos
Merge pull request #10 from swong15/master

scaffold for getTitle and changed tabs to 4 spaces
created mockbackend, took out the mock from the backend and deleted server2
deleting server.settings.js 

to keep the example file there
rebasing and fixing the errors along with completing the backend
Merge branch 'master' of https://github.com/choucalate/testreduce
Merge pull request #11 from choucalate/master

John's mock data & others
fixed small syntactical errors