Merge branch 'master', remote-tracking branch 'upstream/master'
Merge branch 'master', remote-tracking branch 'upstream/master'
Merge branches 'master' and 'feature-models' into feature-models
Further front page changes - pretty bar
Merge branch 'frontpage', remote-tracking branch 'upstream/master' into frontpage
Initial implementation of database models
Merge pull request #13 from jvc26/feature-models

Feature models
Corrected minor typos in models.py
Merge pull request #14 from jvc26/bugfix-models

Corrected minor typos in models.py
Much prettier front page
Title picture fixed after changing file name
Merge branch 'frontpage', remote-tracking branch 'upstream/master' into frontpage
Merge pull request #15 from DeckOfPandas/frontpage

Frontpage
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