Merge pull request #18 from nathanConn/authors

Authors
User update start
User index and admin function added.
dropped index from user controller and renamed index to user_index.
dropped index from user controller and renamed index to user_index.
Merge pull request #19 from nathanConn/register

added register button to login
Merge branch 'master' of https://github.com/nathanConn/TTS-Raleigh-Fall-14-Project into updating-users
user controller edit
Merge pull request #20 from nathanConn/updating-users

Updating users
Merge branch 'master' of https://github.com/nathanConn/TTS-Raleigh-Fall-14-Project into user_athenticate
Merge pull request #21 from nathanConn/user_athenticate

added user authenticate
Merge branch 'master' of https://github.com/nathanConn/TTS-Raleigh-Fall-14-Project into user_athenticate
before adding comments gem