Merge branch 'master' into prae
Test commit

Test commit from Prae's branch
Merge branch 'master' of https://github.com/coderecorder/dev into Prae's-branch

Conflicts:
	index.html
Merge branch 'prae' of https://github.com/coderecorder/dev into Prae's-branch
Test message for merge
Update read me
renamed yeopress back
Merge branch 'prae' of https://github.com/coderecorder/dev into prae
Merge branch 'refs/heads/prae'

Conflicts:
	README.md
Merge branch 'master' of https://github.com/coderecorder/dev

Conflicts:
	README.md