no message
Merge branch 'master' of https://github.com/clnye15/CS-Final-Project-Prototype

# By Jason Shu (7) and Ben Weinshel (2)
# Via Jason Shu
* 'master' of https://github.com/clnye15/CS-Final-Project-Prototype:
  PRETTY NOW
  Fixed extra rows in edit.html
  Fixed date parsing on loading edit page
  no message
  no message
  no message
  no message
  no message
  no message