commit before merge
Merge branch 'master' of https://github.com/intermedialab/atrium-display

Conflicts:
	app/AtriumDisplay/src/AtriumDisplayApp.cpp
	app/AtriumDisplay/xcode/build/AtriumDisplay.build/Debug/AtriumDisplay.build/Objects-normal/i386/AtriumDisplayApp.o
	app/AtriumDisplay/xcode/build/AtriumDisplay.build/Debug/AtriumDisplay.build/build-state.dat
	app/AtriumDisplay/xcode/build/Debug/AtriumDisplay.app/Contents/MacOS/AtriumDisplay
Merge branch 'master' of https://github.com/intermedialab/atrium-display

Conflicts:
	app/AtriumDisplay/xcode/build/AtriumDisplay.build/Debug/AtriumDisplay.build/Objects-normal/i386/AtriumDisplayApp.o
	app/AtriumDisplay/xcode/build/AtriumDisplay.build/Debug/AtriumDisplay.build/build-state.dat
	app/AtriumDisplay/xcode/build/Debug/AtriumDisplay.app/Contents/MacOS/AtriumDisplay
Cleaned