Finishing wikinav and contribute
Merge branch 'master' of https://github.com/seaside98/Parallel

Conflicts:
	Parallel.scss