setting up ignore on certain files for git
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/lkspencer/caster/Connection.java
setting up ignore on certain files for git