updated views
commit changes
Merge pull request #4 from kzhlin/logic

Logic