asd
Merge branch 'master' of git@github.com:rguess/mystyle.git

Conflicts:
	src/main/java/org/guess/security/controller/HelloController.java