First commit
Merge branch 'master' of github.com:anastasialanz/portfolio

Conflicts:
	README.md