Initial commit to add default .gitIgnore and .gitAttribute files.
basic app
json from wiki
json
Merge remote-tracking branch 'origin/mybranch'

Conflicts:
	App1

committing merge conflicts