removes old info from seed.rb file
Merge branch 'master' into work

adds controller files, had existing un-merged db seed changes
displays users in table
Merge branch 'master' of https://github.com/lisavogtsf/awesome_blog

Conflicts:
	app/views/users/index.html.erb

attempting to merge after semantic additions and basic table forms
Merge branch 'master' into work

attempting merge after semantic ui changes
Merge branch 'master' of https://github.com/lisavogtsf/awesome_blog into lisa

merging semantic ui
Merge pull request #28 from lisavogtsf/lisa

More cleanup from the semantic merging