fixes some user show errors and builds it out more. adding version page...
Merge branch 'master' of https://github.com/milanij/writerShareApp into friending-users
adds in th before action for verisons_controller
Merge pull request #10 from milanij/friending-users

Friending users
Merge branch 'master' of https://github.com/milanij/writerShareApp
fixes an error in deleting friends
Merge branch 'master' of https://github.com/milanij/writerShareApp into friending-users
Merge pull request #11 from milanij/friending-users

Friending users
Merge branch 'master' of https://github.com/milanij/writerShareApp
adds the text editor to versions new page
Merge pull request #12 from milanij/versions_new

adds the text editor to versions new page
Finally got public activity working
Merge branch 'master' of https://github.com/milanij/writerShareApp
a little of everything... migrations. Working on new version view
Merge pull request #13 from milanij/versions_new

a little of everything... migrations. Working on new version view
trying to repair damage again
adds some shoulda tests. puts a pic in the navbar. fixes crazy issues.
fixes merge conflits
Merge pull request #14 from milanij/versions_new

Versions new
working on layouts for things