added button to dashboard
resolved conflict
added submit button to editor page
Merge branch 'master' of https://github.com/wilwong/csc309-v2