12/5/14

working on accordion
Freaking forEach loop...

sucks
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/angular/app.js
	views/index.html