time changed to millis()
Merge branch 'master' of https://github.com/elarenee/GiggleBean

Conflicts:
	track.h