added angular js
fixing merge conflicts between bootstrap + angular
Merge pull request #3 from brsoff/master

awesome! merging now.  i'm also just gonna combine this with danny's and it'll all just be version 0.0.7 and put into a single build.