commit before pull
Conflicts:
	prolog_homepage_v3 (3).psd
comps for jan
Merge branch 'master' of https://github.com/Anniepoo/swiplsitedesign

Conflicts:
	prolog_homepage_v4.psd
Added comps of various states, 1col, 2col pages, updated PSD and cleaned up layers