new audio changes
audio merges
fixed conflicts
merge conflicts solved
timer class works as it should
timer class really really works
navigation button attempt 1
slide counter fix
Merge branch 'gh-pages' of github.com:paroza/TFI_hack_2013 into gh-pages
here
Merge branch 'gh-pages' of github.com:paroza/TFI_hack_2013 into gh-pages
goodbye blue line
Merge branch 'gh-pages' of github.com:paroza/TFI_hack_2013 into gh-pages
right audio/video files
placed buttons in center
Merge branch 'gh-pages' of github.com:paroza/TFI_hack_2013 into gh-pages
martha message
Merge branch 'gh-pages' of github.com:paroza/TFI_hack_2013 into gh-pages
Ch4 additions, no title card video
button changes