Added angular code in plan.html to procedurally create columns based on dummy data in planCtrl.js, sorry for the horrible CSS!
Fixed merge conflict