update gitignore
Merge branch 'master' of github.com:Orasi/onTap
Merge branch 'master' of github.com:Orasi/onTap
Merge branch 'master' of github.com:Orasi/onTap
Merge branch 'master' of github.com:Orasi/onTap
Merge branch 'master' of github.com:Orasi/onTap
merge
merge