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