main page layout
Merge remote-tracking branch 'origin/develop' into feature/ISSUE-4

Conflicts:
	.gitignore
Merge remote-tracking branch 'origin/develop' into feature/ISSUE-4

Conflicts:
	.gitignore
gitignore
layout
Merge pull request #13 from mpienkowski/feature/ISSUE-4