update
add sass
Merge branch 'master' of github.com:debugger/wedding

Conflicts:
	src/resources/styles/main.css