clean board, add input check
fix merge conflicts
Merge pull request #8 from Eye-Static/andy

clean board, add input check on board
resolving conflicts