migrated test database
added first and last names to users, tests for user validations, user table in admin (incomplete)
 Timeline integrated with main page; smooth scrolling at button click; changed colours of timeline; (8h)
 Minor changes: colours (1h)
merged with bootstrap
solved scroll-to-top bug, added maximum zoom level for Gmaps
small changes to js
merged user branch
migrated user table
fixed the items admin page
fixed items
pulled
changes in admin: navbar & tables
worked on items
fixed new page for items
gmaps: close infowindow when another opens
Pop ups close when map is clicked
Feedback C + started sentiment analysis
Merge branch 'master' of https://github.com/EclairBristol/playfulgallerymaster
rails part for likes