temp
Merge branch 'master' of github.com:shaief/AlterNative
buttons
.gitignore
Merge branch 'master' of github.com:shaief/AlterNative
playing with js. ignore.
cleaning trials
Merge branch 'master' of github.com:shaief/AlterNative

Conflicts:
	client/main.html
	client/main.js