Git

Front End:
========

- History
- Vision & Mission
- Quality Policy
- Activities
git
git
git
Merge branch 'master' of https://github.com/nickyudha/propan

Conflicts:
	pages/about.php