Updates
Merge branch 'master' of github.com:allynfolksjr/NikkyHomeWebsite

Conflicts:
	views/resume.md