added some content
Merge branch 'master' of https://github.com/ladpal/Final

Conflicts:
	public_html/css/main.css
Merge branch 'master' of https://github.com/ladpal/Final

Conflicts:
	public_html/css/main.css
Merge branch 'master' of https://github.com/ladpal/Final