Adds initial home json
Merge branch 'master' of https://github.com/DiegoGarza/EventFeed
Recreates interface
Adds random name to user
Merge branch 'master' of https://github.com/DiegoGarza/EventFeed

Conflicts:
	app/views/layouts/_header.html.erb
Name and timestamps
Merge branch 'master' of https://github.com/DiegoGarza/EventFeed
Tips and names
ings
Distinguishes between OP and normal users and adds user name display
Merge branch 'master' of https://github.com/DiegoGarza/EventFeed
Order by count
Merge branch 'master' of https://github.com/DiegoGarza/EventFeed
Merge branch 'master' of https://github.com/DiegoGarza/EventFeed into sendgrid

Conflicts:
	app/mailers/user_mailer.rb