not sure whats here
merge conflict
Merge branch 'development' of github.com:trinityXmontoya/project_2 into nil

Conflicts:
	app/views/users/show.html.erb
Merge branch 'development' of github.com:trinityXmontoya/project_2 into nil
Created Categories view, created favicon, updated images
seeds file changed again and now includes imgur images
layout changes, twitter button functionality
merge development and nil