laurie add create
laurie add create
Laurie clean up her code to merge with jon
working on edit
edit button
modified conflicts from jon
trying to fix errorname message
delete component added
bs added
with updated schema
Merge branch 'jon' of github.com:jonathonpark91/tickget into laurie

Conflicts:
	db/schema.rb
	test/fixtures/users.yml
changed pic on index and made 1st page static
updating with jon's authorization
merging index and css pages
Gemfile.lock updated
gemfile and gemfile.lock updated
more merging to get clean file from master
trying to merge once again
Merge branch 'master' of github.com:jonathonpark91/tickget into laurie
css done for user pages