first commit
Merge branch 'master' of github.com:njoy89/portofolio

Conflicts:
	.gitignore
gitignore