Before advice, and simple pointcut examples
using Joinpoints as arguments to advices, selecting arguments
resolve conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	spring-aop/.gitignore
	spring-aop/src/main/java/net/entrofi/sportslogtracker/springaop/SpringAOPDemo.java
	spring-aop/src/main/java/net/entrofi/sportslogtracker/springaop/user/aspect/UserAspectJoinPoint.java
	spring-aop/src/main/java/net/entrofi/sportslogtracker/springaop/user/aspect/UserAspectPointcut.java
	spring-aop/src/main/java/net/entrofi/sportslogtracker/springaop/user/service/UserService.java