Revised timing logic
added assets
Merge https://github.com/MatthewRuby/ExtraMedium

Conflicts:
	bin/data/dick.txt
	src/main.cpp
	src/testApp.cpp
	src/testApp.h