Small bug fixes
Merge remote branch 'origin/master'

Conflicts:
	partials/partial2.html
Fixed bugged merging