routine - attempting to merge with richmon's branch after commit

nathanhood · Aug 17, 2014 · cc34517 · cc34517
1 parent 2510c70
commit cc34517
Show file tree

Hide file tree

Showing 69 changed files with 0 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/.jshintrc b/.jshintrc
diff --git a/.travis.yml b/.travis.yml
diff --git a/Gruntfile.js b/Gruntfile.js
diff --git a/README.md b/README.md
diff --git a/app/app.js b/app/app.js
diff --git a/app/less/app.less b/app/less/app.less
diff --git a/app/lib/init-mongo.js b/app/lib/init-mongo.js
diff --git a/app/lib/init-routes.js b/app/lib/init-routes.js
diff --git a/app/lib/route-debugger.js b/app/lib/route-debugger.js
diff --git a/app/lib/sockets.js b/app/lib/sockets.js
diff --git a/app/models/.gitkeep b/app/models/.gitkeep
diff --git a/app/models/base.js b/app/models/base.js
diff --git a/app/models/group.js b/app/models/group.js
diff --git a/app/models/location.js b/app/models/location.js
diff --git a/app/models/quest.js b/app/models/quest.js
diff --git a/app/models/quiz.js b/app/models/quiz.js
diff --git a/app/models/user.js b/app/models/user.js
diff --git a/app/routes/groups.js b/app/routes/groups.js
diff --git a/app/routes/home.js b/app/routes/home.js
diff --git a/app/routes/locations.js b/app/routes/locations.js
diff --git a/app/routes/quests.js b/app/routes/quests.js
diff --git a/app/routes/users.js b/app/routes/users.js
diff --git a/app/static/audios/.gitkeep b/app/static/audios/.gitkeep
diff --git a/app/static/css/.gitkeep b/app/static/css/.gitkeep
diff --git a/app/static/img/.gitkeep b/app/static/img/.gitkeep
diff --git a/app/static/img/53c5f5d3372b92767e3e4a1f/4ac2b9f2c70a46f85bcce8be.png b/app/static/img/53c5f5d3372b92767e3e4a1f/4ac2b9f2c70a46f85bcce8be.png
diff --git a/app/static/img/53c6be7c4ab4c04e1dc7c8f4/037154387bfee2d4e265eda4.png b/app/static/img/53c6be7c4ab4c04e1dc7c8f4/037154387bfee2d4e265eda4.png
diff --git a/app/static/img/53c6c1c6225aebf01d8381f7/cc37ac362f280d2094152175.pdf b/app/static/img/53c6c1c6225aebf01d8381f7/cc37ac362f280d2094152175.pdf
diff --git a/app/static/img/53d54f656f9115b7961e15f8/9154ccd3d544db7be60b8f8c.jpg b/app/static/img/53d54f656f9115b7961e15f8/9154ccd3d544db7be60b8f8c.jpg
diff --git a/app/static/img/53e54fff2747d457f8a6761c/c3c801a38e303faf0a987467.jpg b/app/static/img/53e54fff2747d457f8a6761c/c3c801a38e303faf0a987467.jpg
diff --git a/app/static/img/pin-dot.svg b/app/static/img/pin-dot.svg
diff --git a/app/static/img/pin-filled.svg b/app/static/img/pin-filled.svg
diff --git a/app/static/js/es5/main.js b/app/static/js/es5/main.js
diff --git a/app/static/js/es6/compiled/.gitkeep b/app/static/js/es6/compiled/.gitkeep
diff --git a/app/static/js/es6/create-group.es6.js b/app/static/js/es6/create-group.es6.js
diff --git a/app/static/js/es6/create-quest-add-locations.es6.js b/app/static/js/es6/create-quest-add-locations.es6.js
diff --git a/app/static/js/es6/create-quest.es6.js b/app/static/js/es6/create-quest.es6.js
diff --git a/app/static/js/es6/dashboard.es6.js b/app/static/js/es6/dashboard.es6.js
diff --git a/app/static/js/es6/location-details.es6.js b/app/static/js/es6/location-details.es6.js
diff --git a/app/static/js/es6/locations.es6.js b/app/static/js/es6/locations.es6.js
diff --git a/app/static/js/es6/main.es6.js b/app/static/js/es6/main.es6.js
diff --git a/app/static/js/es6/sockets.es6.js b/app/static/js/es6/sockets.es6.js
diff --git a/app/static/js/vendor/jquery-2.1.1.js b/app/static/js/vendor/jquery-2.1.1.js
diff --git a/app/static/js/vendor/lodash-2.4.1.js b/app/static/js/vendor/lodash-2.4.1.js
diff --git a/app/static/js/vendor/moment-2.6.0.js b/app/static/js/vendor/moment-2.6.0.js
diff --git a/app/static/js/vendor/traceur.js b/app/static/js/vendor/traceur.js
diff --git a/app/static/videos/.gitkeep b/app/static/videos/.gitkeep
diff --git a/app/views/groups/create-group.jade b/app/views/groups/create-group.jade
diff --git a/app/views/home/confirmation.jade b/app/views/home/confirmation.jade
diff --git a/app/views/home/index.jade b/app/views/home/index.jade
diff --git a/app/views/locations/detail.jade b/app/views/locations/detail.jade
diff --git a/app/views/locations/index.jade b/app/views/locations/index.jade
diff --git a/app/views/map/index.jade b/app/views/map/index.jade
diff --git a/app/views/quests/create-quest.jade b/app/views/quests/create-quest.jade
diff --git a/app/views/quests/quest-confirmation.jade b/app/views/quests/quest-confirmation.jade
diff --git a/app/views/shared/template.jade b/app/views/shared/template.jade
diff --git a/app/views/users/checkIn.jade b/app/views/users/checkIn.jade
diff --git a/app/views/users/index.jade b/app/views/users/index.jade
diff --git a/app/views/users/profile.jade b/app/views/users/profile.jade
diff --git a/db/data.json b/db/data.json
diff --git a/db/groups.json b/db/groups.json
diff --git a/package.json b/package.json
diff --git a/test/fixtures/.gitkeep b/test/fixtures/.gitkeep
diff --git a/test/helpers/db.js b/test/helpers/db.js
diff --git a/test/helpers/factory.js b/test/helpers/factory.js
diff --git a/test/types/acceptance/.gitkeep b/test/types/acceptance/.gitkeep
diff --git a/test/types/unit/.gitkeep b/test/types/unit/.gitkeep
diff --git a/tools/.gitkeep b/tools/.gitkeep