updated gitignore, and hide secret key
updated gitignore
fixed conflict
fixed merge conflicts
fixed merge conflicts again
updating git to refelct new fetch
added routes
Merge pull request #6 from smspezzano/making_routes

Making routes
added dashboard route
added users controller
Merge pull request #7 from missherico/users_control

Users control