first commit
first commit
Merge branch 'master' of https://github.com/voyageravv/voyageravv.github.io

Conflicts:
	app/partials/welcome.html