Modal general styling
Merge branch 'master' of https://github.com/12sm/deupy

Conflicts:
	css/main.css