added gitignore
added gitignore
added gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	client/views/admin/admin.html
	client/views/admin/admin.js
	server/startup.js
added gitignore
added gitignore
added gitignore
added gitignore
added gitignore
added gitignore
added gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	client/views/admin/admin.html
	client/views/admin/admin.js
	server/startup.js
added gitignore