nsit :p
Merge branch 'origin' of https://github.com/amineorion/goodNbad into
origin2

Conflicts:
	goodNbad/web/goodnbad.dart
	goodNbad/web/model/Target.dart