save
save
save
Merge remote-tracking branch '451order_jilse/master'

Conflicts:
	app/partials/checkOutView.html
	app/partials/nav.html
save
test
no
Merge remote-tracking branch '451order_jilse/master'

Conflicts:
	app/css/app.css
	app/index.html
	app/js/controllers/Four51Ctrl.js
	app/partials/nav.html
	app/partials/sideNav.html
I did not merge four51Ctrl correctly, copied original from git-  resolved.
also added active path back in- but i think i can do this differently here shortly
save
Merge remote-tracking branch '451order_jilse/master'

Conflicts:
	app/js/controllers/Four51Ctrl.js
save
save
default color scheme starting to come together
save
not happy with some of the design- went back a couple steps in an effort to try a different approach
Merge remote-tracking branch '451order_jilse/master'
save
save
save