Added .gdbinit
Merge remote-tracking branch 'origin/master' into marvin

Just updating marvin
Merge remote-tracking branch 'origin/marvin' into mike

Syncing mike with marvin