Add .gitignore
Merge remote-tracking branch 'campbellmath/master' into winnie

Conflicts:
	.cgdb/readline_history.txt