commit
Merge branch 'master' of https://github.com/caritakathon-gitlucky/jvpfi

Conflicts:
	public_html/assets/css/core.css
	public_html/index.html