updates
Merge branch 'master' of https://github.com/aroldoa/tutumoi

Conflicts:
	wp-content/themes/tutumoi/style.css