Edit about.html
Merge branch 'master' of https://github.com/krosa/liteformDESIGN

Conflicts:
	css/main.css

git pull