Remove conditional parsing logic based on file extensions
Remove conditional parsing logic based on file extensions
Merge branch 'master' of https://github.com/abielr/markmon

Conflicts:
	lib/Server.js