reset
Merge branch 'new' of github.com:kitsusia/SimNote into new
clear_ahead