update require() for callyummly. points to ../config/ folder now. added ~/server/config/ for config files. added /config/routes.js
able to serve static files now, needs to pull routes out of server.js next
merging conflicts
;
Merge pull request #16 from MrSpothawk/routesjs

serve static files from ~/app
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