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 #27 from MooreJesseB/master

Post controller cleanup.
Merge pull request #28 from lisavogtsf/lisa

More cleanup from the semantic merging
add tags, post_tags and setup relationship with post
fixed merge conflict in users edit.html.erb
posts controller update
Merge pull request #29 from marklc44/master

tag model, post_tag model and post model many to many associations
Merge pull request #30 from indotek68/master

posts controller update
Post edit new with partial.  Comment controller work in progress