Committing my version of the db
fixing merge conflict by taking lily's version of the files
Merge branch 'master' of https://github.com/lilsplat/bowser
Student profile form, template in place
Merge branch 'master' of https://github.com/lilsplat/bowser