Merge branch 'frontpage', remote-tracking branch 'upstream/master' into frontpage
Merge branch 'feature-views', remote-tracking branch 'upstream/master' into feature-views
Enable admin interface
Added default fixtures for celltypes
Added ModelForm for input
Added image overlay, undo function and space keydown
Merge devel and upstream
Merge pull request #16 from oghm2/devel

Devel
Merge branch 'feature-views', remote-tracking branch 'upstream/master' into feature-views
Fix base URL to 'Work' link
Update model for CellType to include comment field and machine_name
Fixed typo in initial_data.json
Hacky addition of images to static
Merge branch 'development', remote-tracking branch 'upstream/master' into development
Merge pull request #17 from haematologic/development

Hacky addition of images to static
Merge branch 'devel', remote-tracking branch 'upstream/master' into devel
Very pretty front page with title logo
Changed title from results to report
Implemented basic submission page
Merge branch 'feature-views', remote-tracking branch 'upstream/master' into feature-views