Merge pull request #1 from kubamarchwicki/master

OpenAssets initial pull request
issue #1 - removed background and borders; limited width to 940px
issue #1 - removing bootstrap css classes for width >940px
Merge pull request #8 from luziczek/master

Usunięcie tła oraz zaokrągleń + nadanie maksymalnej szerokości 940px
Merge branch 'pr/6'

Conflicts:
	src/main/webapp/css/main.css
Merge branch 'master' of https://github.com/kodujdlapolski/OpenAssets