it compiles now
fixed merge issues
removed whitespace
fixed merge breakages
merged sbc changes
fixed DS_Store in gitignore
clocktroller sort of works
Merge branch 'clocktroller'

* clocktroller:
  clocktroller sort of works
  fixed DS_Store in gitignore
  merged sbc changes
  fixed merge breakages
  removed whitespace
  fixed merge issues
  it compiles now

Conflicts:
	autom4te.cache/requests
	back_end/opcode_executor/Makefile.in
	back_end/opcode_executor/opcode_executor.cc
	back_end/opcode_executor/opcode_executor.h
	back_end/opcode_executor/opcode_handlers.cc
	back_end/opcode_executor/opcode_handlers.h
	back_end/opcode_executor/opcodes.h
Diego forgot a period
clocktroller tests
Merge branch 'master' of github.com:turbo-santa/turbo-santa-common

* 'master' of github.com:turbo-santa/turbo-santa-common:
  Diego forgot a period
  Added warning comments to test_harness.
  Fixed EI and DI.
  Added test for LoadAndRunROM.
  Added a set of methods to test running several instructions at once.
  Expanded test harness to allow manipulation of memory state.
  Added the interrupt check proceedure into fetch.
  Created constructor for opcode map and removed opcode_map.

Conflicts:
	.gitignore
	back_end/opcode_executor/opcode_executor.cc
	back_end/opcode_executor/opcode_map.cc
fixed duplicate defs
clocktroller tests pass. seems functional. Also removed some auto-gen files
now use sleep_for instead of usleep
removed unused variables
Fixed the gitignore.
Fixed memory allocation error in ram_segment.
Fixed several issues in clocktroller.
Merge branch 'master' into graphics

Conflicts:
	back_end/Makefile.am
	back_end/Makefile.in
	configure
Removed clocktroller_test binary.