added angular and ng-touch
Merge branch 'master' into frontend
fixed some typos in paths in the css
implemented angular rounting, but needs testing
angular setup is almost there
Merge branch 'master' into frontend
organizing angular files
more angular scaffolding
starting to build out recipe template
Merge branch 'master' into frontend
commented "hello world" test
moved routes out of server.js. minor testing text changes in callyummly.js
Merge branch 'master' into routesjs
removing commented lines from server.js
Merge pull request #17 from MrSpothawk/routesjs

moved server.js routes to routes.js
continued work on angular router
Merge branch 'master' into frontend
angular router is working
Merge pull request #18 from KyleW/frontend

Basic Angular structure and Angular router work
fixing merge conflicts in server.js and routes.js