sprint 2

user interface
Merge pull request #1 from maijake/master

sprint 2