Local Changes

Local changes made in pc.
Merge branch 'master' of https://github.com/Josiastech/front-end

Conflicts:
	index.html