migrated test database
added first and last names to users, tests for user validations, user table in admin (incomplete)
small changes to js
merged user branch
migrated user table
fixed the items admin page
fixed items
pulled
worked on items
fixed new page for items
resolved conflict
:P
minor changes to layout: changed color of timeline, made the footer smaller
started adding comments to the main project
started adding comments to the main project
solved conflicts