adding make options for gdb
Merge remote-tracking branch 'origin/master'
moving class structure to header file