File loc
Merge branch 'master' of https://github.com/marlon-rodrigues/personal_website

Conflicts:
	nbproject/private/private.xml