comp colors
Merge branch 'master' of github.com:wannabefro/BAMC into amanda-pulse
Merge branch 'master' of github.com:wannabefro/BAMC into amanda-pulse
merge conflicts
prettier speakers
better tracks new page
merge conflicts
Merge pull request #10 from wannabefro/amanda-pulse

Amanda pulse