Updated user model and users controller. Created user registration form partial and new user page to put the partial in.
fixed users controller issue (extra end)
replaced initial user registration partial form with a simpleform and added relevant fields (except for photo)
stripped out turbolinks from gemfile, application.js, and application.html.erb because it was breaking dotenv's ability to properly store environment variables
User registration form is working (haven't added in photo capability yet
Merge pull request #10 from Noahhh/master

Discover page and Yelp api ajax call built out a little
Merge pull request #11 from Noahhh/master

added more results for yelp
User log in and log out are now both working successfully. Ran migration to remove the username field from Users table as it is redundant.
added mapbox gem, entries to
application css and js
added discover link on home page
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru

Conflicts:
	Gemfile
	app/controllers/users_controller.rb
	app/models/user.rb
	app/views/home/index.html.erb
	app/views/layouts/application.html.erb
	config/routes.rb
	db/schema.rb
fixed foursquare login
adding to gitignore
adding to gitignore
removed env files
Merge pull request #13 from gregburton/master

User creation, log in, and log out all working. Ran migration to remove username field from Users table. Added Mapbox gem.
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
Merge pull request #14 from dheckman/master

added dicover link on homepage, fixed foursquare login with correct keys
changed top bar to allow current user