Add readme and modify info.properties
Edit info.properties - add password
Added license and modified readme
Add project logo jpg
Merge branch 'ff1'
Add index file
Add div text
Add attribute to div and add welcome text
Merge branch 'ff2'

Conflicts:
	index.txt