Update .gitignore
update UI
Update .gitignore
iteration 1 all UI elements done
update UI elements
merge trevor branch
Merge pull request #5 from dazhaoniel/master

update android