Epidemik code

my css
made a change
Merge branch 'Epidemik'
Test!
test
Merge branch 'Epidemik'
Merge branch 'master' into Epidemik
Updated the markup!
Merge branch 'dom'

Conflicts:
	demo.html
Merge remote-tracking branch 'origin/Epidemik'
Merge remote-tracking branch 'origin/daz-branch'
Merge branch 'master' into daz-branch