vincent commit1
commit2
switching to master
…
commit3
commit4
userinterfacestate.
Merging with Vincent branch
Merge branch 'vincent'