new branch testing stuff
added gitignore to app/config
Merge remote-tracking branch 'origin/sockets' into sockets

Conflicts:
	app/config/.gitignore