Added main files
Added main files
Merge branch 'master' of github.com:bpeacock/Portfolio

Conflicts:
	README.md