Resovled conflict for adding the sample route.

Author: mmakino

.gitignore

@@ -35,7 +35,7 @@ build/Release
 # Dependency directories
 node_modules/
 jspm_packages/
-package-lock.json
+*package-lock.json
 
 # TypeScript v1 declaration files
 typings/
@@ -62,4 +62,5 @@ typings/
 .next
 
 # from MacOS
-.DS_Store
+*.DS_Store
+