Modified git file
Modified git file
Merge branch 'master' of https://github.com/mbonvini/Greenvite

Conflicts:
	README.md
Created initial page