commiting everything
Merge https://github.com/ralucacocioban/simpleWebsite

Conflicts:
	README.md