Regenerated Gemfile.lock
Resolve conflict with gemfile
Remove redundancies from Gemfile
Store user's name and display on welcome screen
Create migration for artists table
Add event model
Can see concert results for a manual artist search. Results are persisted in the database.
changes to controller
Merge branch 'master' of github.com:ruby005-reed-sufrin-tang/concertify-me