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 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