zdfgnongjn
huh?
Merge branch 'master' of https://github.com/Yuugo/Health-Informatics-Social-Phobia

Conflicts:
	Code/NijnCoach/NijnCoach/NijnCoach.csproj
Merge branch 'master' of https://github.com/Yuugo/Health-Informatics-Social-Phobia