testing
Merge branch 'master' into timeline-simple

Conflicts:
	libs/album-timeline.js
added x-axis, and added circles in right place for where the balls will go. need to align veritically, and set size properly.
promises promises.
in process of adding labels to blobs
Merge branch 'timeline-simple'

Conflicts:
	libs/album-timeline.js
separate function for drawing nodes