copying in files
redid bower, and wrote basic routing
rebased
route fixed
angular is hooked up
conflict resolved
Merge pull request #33 from zindlerb/master

angular is hooked up