commented out the working code for angularjs but its still there if you want it
this is a messed up copy that may or may not work after the merge conflicts were resolved