minor change
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.php
Merge remote-tracking branch 'origin/master'
changed carriage-returns to newlines
Merge remote-tracking branch 'origin/master'

Conflicts:
	style.css
added dan to the README.md