aaa
Merge branch 'master' of https://github.com/gmarescotti/WP-Resume

Conflicts:
	includes/admin.php
i18n almost done.