removed non os x files from os branch
got basic os x build working
makefile fixes
update INSTALL
added debug flags and TODO for unit tests
Merge branch 'master' into osx_only

Conflicts:
	Building.cpp
	Building.hpp
	Elevator.cpp
	ElevatorSim.hpp
	INSTALL
	Lib/__future__.py
	Lib/_dummy_thread.py
	Lib/_pyio.py
	Lib/_strptime.py
	Lib/_weakrefset.py
	Lib/abc.py
	Lib/aifc.py
	Lib/argparse.py
	Lib/ast.py
	Lib/asynchat.py
	Lib/asyncore.py
	Lib/base64.py
	Lib/bdb.py
	Lib/binhex.py
	Lib/cgi.py
	Lib/cgitb.py
	Lib/code.py
	Lib/codecs.py
	Lib/collections/__init__.py
	Lib/collections/abc.py
	Lib/concurrent/futures/_base.py
	Lib/concurrent/futures/process.py
	Lib/concurrent/futures/thread.py
	Lib/configparser.py
	Lib/contextlib.py
	Lib/copy.py
	Lib/ctypes/__init__.py
	Lib/ctypes/test/test_bitfields.py
	Lib/ctypes/test/test_callbacks.py
	Lib/ctypes/test/test_memfunctions.py
	Lib/ctypes/test/test_numbers.py
	Lib/ctypes/test/test_parameters.py
	Lib/ctypes/test/test_pep3118.py
	Lib/ctypes/test/test_python_api.py
	Lib/ctypes/test/test_refcounts.py
	Lib/ctypes/test/test_stringptr.py
	Lib/ctypes/util.py
	Lib/curses/__init__.py
	Lib/datetime.py
	Lib/decimal.py
	Lib/difflib.py
	Lib/dis.py
	Lib/distutils/__init__.py
	Lib/distutils/command/bdist_rpm.py
	Lib/distutils/command/bdist_wininst.py
	Lib/distutils/command/build_ext.py
	Lib/distutils/command/build_scripts.py
	Lib/distutils/command/upload.py
	Lib/distutils/cygwinccompiler.py
	Lib/distutils/sysconfig.py
	Lib/distutils/tests/test_archive_util.py
	Lib/distutils/tests/test_bdist_msi.py
	Lib/distutils/tests/test_bdist_rpm.py
	Lib/distutils/tests/test_sdist.py
	Lib/distutils/tests/test_sysconfig.py
	Lib/distutils/tests/test_util.py
	Lib/distutils/unixccompiler.py
	Lib/distutils/util.py
	Lib/doctest.py
	Lib/email/__init__.py
	Lib/email/_parseaddr.py
	Lib/email/errors.py
	Lib/email/feedparser.py
	Lib/email/generator.py
	Lib/email/header.py
	Lib/email/message.py
	Lib/email/mime/text.py
	Lib/email/parser.py
	Lib/email/utils.py
	Lib/encodings/cp037.py
	Lib/encodings/cp500.py
	Lib/encodings/hp_roman8.py
	Lib/encodings/idna.py
	Lib/encodings/iso8859_1.py
	Lib/encodings/mac_latin2.py
	Lib/encodings/palmos.py
	Lib/encodings/ptcp154.py
	Lib/fileinput.py
	Lib/fnmatch.py
	Lib/ftplib.py
	Lib/functools.py
	Lib/getopt.py
	Lib/getpass.py
	Lib/gettext.py
	Lib/gzip.py
	Lib/hashlib.py
	Lib/hmac.py
	Lib/html/entities.py
	Lib/html/parser.py
	Lib/http/client.py
	Lib/http/cookiejar.py
	Lib/http/cookies.py
	Lib/http/server.py
	Lib/idlelib/AutoComplete.py
	Lib/idlelib/AutoCompleteWindow.py
	Lib/idlelib/CallTipWindow.py
	Lib/idlelib/CallTips.py
	Lib/idlelib/ColorDelegator.py
	Lib/idlelib/EditorWindow.py
	Lib/idlelib/GrepDialog.py
	Lib/idlelib/IOBinding.py
	Lib/idlelib/NEWS.txt
	Lib/idlelib/OutputWindow.py
	Lib/idlelib/PathBrowser.py
	Lib/idlelib/PyShell.py
	Lib/idlelib/ReplaceDialog.py
	Lib/idlelib/ScriptBinding.py
	Lib/idlelib/configDialog.py
	Lib/idlelib/configHandler.py
	Lib/idlelib/idlever.py
	Lib/idlelib/macosxSupport.py
	Lib/idlelib/rpc.py
	Lib/idlelib/run.py
	Lib/idlelib/tabbedpages.py
	Lib/imaplib.py
	Lib/importlib/__init__.py
	Lib/importlib/_bootstrap.py
	Lib/importlib/abc.py
	Lib/importlib/machinery.py
	Lib/importlib/util.py
	Lib/inspect.py
	Lib/io.py
	Lib/json/__init__.py
	Lib/json/decoder.py
	Lib/json/encoder.py
	Lib/json/tool.py
	Lib/lib2to3/fixer_base.py
	Lib/lib2to3/pgen2/driver.py
	Lib/lib2to3/pytree.py
	Lib/lib2to3/refactor.py
	Lib/lib2to3/tests/test_parser.py
	Lib/lib2to3/tests/test_pytree.py
	Lib/logging/__init__.py
	Lib/logging/config.py
	Lib/logging/handlers.py
	Lib/mailbox.py
	Lib/mailcap.py
	Lib/mimetypes.py
	Lib/modulefinder.py
	Lib/multiprocessing/__init__.py
	Lib/multiprocessing/connection.py
	Lib/multiprocessing/dummy/__init__.py
	Lib/multiprocessing/dummy/connection.py
	Lib/multiprocessing/forking.py
	Lib/multiprocessing/heap.py
	Lib/multiprocessing/managers.py
	Lib/multiprocessing/pool.py
	Lib/multiprocessing/process.py
	Lib/multiprocessing/queues.py
	Lib/multiprocessing/reduction.py
	Lib/multiprocessing/sharedctypes.py
	Lib/multiprocessing/synchronize.py
	Lib/multiprocessing/util.py
	Lib/nntplib.py
	Lib/numbers.py
	Lib/opcode.py
	Lib/optparse.py
	Lib/os.py
	Lib/pdb.py
	Lib/pickle.py
	Lib/pickletools.py
	Lib/pipes.py
	Lib/pkgutil.py
	Lib/plat-linux/CDROM.py
	Lib/plat-linux/DLFCN.py
	Lib/plat-linux/IN.py
	Lib/plat-linux/TYPES.py
	Lib/plat-linux/regen
	Lib/platform.py
	Lib/plistlib.py
	Lib/poplib.py
	Lib/posixpath.py
	Lib/pprint.py
	Lib/profile.py
	Lib/pstats.py
	Lib/py_compile.py
	Lib/pyclbr.py
	Lib/pydoc.py
	Lib/pydoc_data/topics.py
	Lib/queue.py
	Lib/random.py
	Lib/re.py
	Lib/rlcompleter.py
	Lib/runpy.py
	Lib/sched.py
	Lib/shlex.py
	Lib/shutil.py
	Lib/site.py
	Lib/smtpd.py
	Lib/smtplib.py
	Lib/socket.py
	Lib/socketserver.py
	Lib/sqlite3/test/dbapi.py
	Lib/sqlite3/test/factory.py
	Lib/sqlite3/test/hooks.py
	Lib/sqlite3/test/regression.py
	Lib/sqlite3/test/transactions.py
	Lib/sqlite3/test/types.py
	Lib/sqlite3/test/userfunctions.py
	Lib/sre_compile.py
	Lib/sre_parse.py
	Lib/ssl.py
	Lib/stat.py
	Lib/string.py
	Lib/subprocess.py
	Lib/sysconfig.py
	Lib/tabnanny.py
	Lib/tarfile.py
	Lib/telnetlib.py
	Lib/tempfile.py
	Lib/test/buffer_tests.py
	Lib/test/crashers/README
	Lib/test/crashers/compiler_recursion.py
	Lib/test/datetimetester.py
	Lib/test/decimaltestdata/extra.decTest
	Lib/test/exception_hierarchy.txt
	Lib/test/fork_wait.py
	Lib/test/future_test1.py
	Lib/test/future_test2.py
	Lib/test/json_tests/test_decode.py
	Lib/test/json_tests/test_dump.py
	Lib/test/json_tests/test_scanstring.py
	Lib/test/list_tests.py
	Lib/test/lock_tests.py
	Lib/test/math_testcases.txt
	Lib/test/mock_socket.py
	Lib/test/multibytecodec_support.py
	Lib/test/namespace_pkgs/module_and_namespace_package/a_test/empty
	Lib/test/namespace_pkgs/not_a_namespace_pkg/foo/__init__.py
	Lib/test/pickletester.py
	Lib/test/regrtest.py
	Lib/test/reperf.py
	Lib/test/script_helper.py
	Lib/test/seq_tests.py
	Lib/test/sha256.pem
	Lib/test/sortperf.py
	Lib/test/ssl_servers.py
	Lib/test/string_tests.py
	Lib/test/support.py
	Lib/test/test__locale.py
	Lib/test/test_abc.py
	Lib/test/test_abstract_numbers.py
	Lib/test/test_aifc.py
	Lib/test/test_argparse.py
	Lib/test/test_array.py
	Lib/test/test_ast.py
	Lib/test/test_asyncore.py
	Lib/test/test_base64.py
	Lib/test/test_bigmem.py
	Lib/test/test_binascii.py
	Lib/test/test_bisect.py
	Lib/test/test_bool.py
	Lib/test/test_builtin.py
	Lib/test/test_bytes.py
	Lib/test/test_bz2.py
	Lib/test/test_calendar.py
	Lib/test/test_capi.py
	Lib/test/test_cgi.py
	Lib/test/test_cmath.py
	Lib/test/test_cmd.py
	Lib/test/test_cmd_line.py
	Lib/test/test_cmd_line_script.py
	Lib/test/test_code.py
	Lib/test/test_codeccallbacks.py
	Lib/test/test_codecencodings_cn.py
	Lib/test/test_codecencodings_hk.py
	Lib/test/test_codecencodings_iso2022.py
	Lib/test/test_codecencodings_jp.py
	Lib/test/test_codecencodings_kr.py
	Lib/test/test_codecencodings_tw.py
	Lib/test/test_codecmaps_cn.py
	Lib/test/test_codecmaps_hk.py
	Lib/test/test_codecmaps_jp.py
	Lib/test/test_codecmaps_kr.py
	Lib/test/test_codecmaps_tw.py
	Lib/test/test_codecs.py
	Lib/test/test_coding.py
	Lib/test/test_collections.py
	Lib/test/test_compile.py
	Lib/test/test_concurrent_futures.py
	Lib/test/test_configparser.py
	Lib/test/test_contextlib.py
	Lib/test/test_copy.py
	Lib/test/test_cprofile.py
	Lib/test/test_crypt.py
	Lib/test/test_curses.py
	Lib/test/test_dbm.py
	Lib/test/test_decimal.py
	Lib/test/test_deque.py
	Lib/test/test_descr.py
	Lib/test/test_descrtut.py
	Lib/test/test_dict.py
	Lib/test/test_dis.py
	Lib/test/test_doctest.py
	Lib/test/test_dummy_thread.py
	Lib/test/test_email/data/PyBanner048.gif
	Lib/test/test_email/data/audiotest.au
	Lib/test/test_email/data/msg_01.txt
	Lib/test/test_email/data/msg_02.txt
	Lib/test/test_email/data/msg_03.txt
	Lib/test/test_email/data/msg_04.txt
	Lib/test/test_email/data/msg_05.txt
	Lib/test/test_email/data/msg_06.txt
	Lib/test/test_email/data/msg_07.txt
	Lib/test/test_email/data/msg_08.txt
	Lib/test/test_email/data/msg_09.txt
	Lib/test/test_email/data/msg_10.txt
	Lib/test/test_email/data/msg_11.txt
	Lib/test/test_email/data/msg_12.txt
	Lib/test/test_email/data/msg_12a.txt
	Lib/test/test_email/data/msg_13.txt
	Lib/test/test_email/data/msg_14.txt
	Lib/test/test_email/data/msg_15.txt
	Lib/test/test_email/data/msg_16.txt
	Lib/test/test_email/data/msg_17.txt
	Lib/test/test_email/data/msg_18.txt
	Lib/test/test_email/data/msg_19.txt
	Lib/test/test_email/data/msg_20.txt
	Lib/test/test_email/data/msg_21.txt
	Lib/test/test_email/data/msg_22.txt
	Lib/test/test_email/data/msg_23.txt
	Lib/test/test_email/data/msg_24.txt
	Lib/test/test_email/data/msg_25.txt
	Lib/test/test_email/data/msg_26.txt
	Lib/test/test_email/data/msg_27.txt
	Lib/test/test_email/data/msg_28.txt
	Lib/test/test_email/data/msg_29.txt
	Lib/test/test_email/data/msg_30.txt
	Lib/test/test_email/data/msg_31.txt
	Lib/test/test_email/data/msg_32.txt
	Lib/test/test_email/data/msg_33.txt
	Lib/test/test_email/data/msg_34.txt
	Lib/test/test_email/data/msg_35.txt
	Lib/test/test_email/data/msg_36.txt
	Lib/test/test_email/data/msg_37.txt
	Lib/test/test_email/data/msg_38.txt
	Lib/test/test_email/data/msg_39.txt
	Lib/test/test_email/data/msg_40.txt
	Lib/test/test_email/data/msg_41.txt
	Lib/test/test_email/data/msg_42.txt
	Lib/test/test_email/data/msg_43.txt
	Lib/test/test_email/data/msg_44.txt
	Lib/test/test_email/data/msg_45.txt
	Lib/test/test_email/data/msg_46.txt
	Lib/test/test_email/test_asian_codecs.py
	Lib/test/test_email/test_email.py
	Lib/test/test_email/torture_test.py
	Lib/test/test_enumerate.py
	Lib/test/test_epoll.py
	Lib/test/test_exceptions.py
	Lib/test/test_extcall.py
	Lib/test/test_filecmp.py
	Lib/test/test_fileinput.py
	Lib/test/test_fileio.py
	Lib/test/test_float.py
	Lib/test/test_format.py
	Lib/test/test_fractions.py
	Lib/test/test_frozen.py
	Lib/test/test_ftplib.py
	Lib/test/test_funcattrs.py
	Lib/test/test_functools.py
	Lib/test/test_future.py
	Lib/test/test_gc.py
	Lib/test/test_gdb.py
	Lib/test/test_generators.py
	Lib/test/test_genericpath.py
	Lib/test/test_genexps.py
	Lib/test/test_getargs2.py
	Lib/test/test_glob.py
	Lib/test/test_grammar.py
	Lib/test/test_gzip.py
	Lib/test/test_hash.py
	Lib/test/test_hashlib.py
	Lib/test/test_hmac.py
	Lib/test/test_htmlparser.py
	Lib/test/test_http_cookiejar.py
	Lib/test/test_http_cookies.py
	Lib/test/test_httplib.py
	Lib/test/test_httpservers.py
	Lib/test/test_imaplib.py
	Lib/test/test_imp.py
	Lib/test/test_import.py
	Lib/test/test_importhooks.py
	Lib/test/test_importlib/abc.py
	Lib/test/test_importlib/builtin/__init__.py
	Lib/test/test_importlib/builtin/test_finder.py
	Lib/test/test_importlib/builtin/test_loader.py
	Lib/test/test_importlib/builtin/util.py
	Lib/test/test_importlib/extension/__init__.py
	Lib/test/test_importlib/extension/test_case_sensitivity.py
	Lib/test/test_importlib/extension/test_finder.py
	Lib/test/test_importlib/extension/test_path_hook.py
	Lib/test/test_importlib/extension/util.py
	Lib/test/test_importlib/frozen/__init__.py
	Lib/test/test_importlib/frozen/test_finder.py
	Lib/test/test_importlib/frozen/test_loader.py
	Lib/test/test_importlib/import_/__init__.py
	Lib/test/test_importlib/import_/test___package__.py
	Lib/test/test_importlib/import_/test_caching.py
	Lib/test/test_importlib/import_/test_fromlist.py
	Lib/test/test_importlib/import_/test_meta_path.py
	Lib/test/test_importlib/import_/test_relative_imports.py
	Lib/test/test_importlib/import_/util.py
	Lib/test/test_importlib/source/__init__.py
	Lib/test/test_importlib/source/test_abc_loader.py
	Lib/test/test_importlib/source/test_case_sensitivity.py
	Lib/test/test_importlib/source/test_file_loader.py
	Lib/test/test_importlib/source/test_finder.py
	Lib/test/test_importlib/source/test_path_hook.py
	Lib/test/test_importlib/source/test_source_encoding.py
	Lib/test/test_importlib/source/util.py
	Lib/test/test_importlib/test_abc.py
	Lib/test/test_importlib/test_api.py
	Lib/test/test_importlib/test_util.py
	Lib/test/test_importlib/util.py
	Lib/test/test_inspect.py
	Lib/test/test_io.py
	Lib/test/test_iter.py
	Lib/test/test_itertools.py
	Lib/test/test_keywordonlyarg.py
	Lib/test/test_lib2to3.py
	Lib/test/test_list.py
	Lib/test/test_locale.py
	Lib/test/test_logging.py
	Lib/test/test_long.py
	Lib/test/test_mailbox.py
	Lib/test/test_marshal.py
	Lib/test/test_math.py
	Lib/test/test_memoryio.py
	Lib/test/test_memoryview.py
	Lib/test/test_metaclass.py
	Lib/test/test_minidom.py
	Lib/test/test_mmap.py
	Lib/test/test_module.py
	Lib/test/test_modulefinder.py
	Lib/test/test_multibytecodec.py
	Lib/test/test_multiprocessing.py
	Lib/test/test_nntplib.py
	Lib/test/test_ntpath.py
	Lib/test/test_numeric_tower.py
	Lib/test/test_optparse.py
	Lib/test/test_os.py
	Lib/test/test_ossaudiodev.py
	Lib/test/test_osx_env.py
	Lib/test/test_parser.py
	Lib/test/test_pdb.py
	Lib/test/test_peepholer.py
	Lib/test/test_pep277.py
	Lib/test/test_pep292.py
	Lib/test/test_pep3131.py
	Lib/test/test_pickle.py
	Lib/test/test_pipes.py
	Lib/test/test_pkg.py
	Lib/test/test_pkgimport.py
	Lib/test/test_pkgutil.py
	Lib/test/test_platform.py
	Lib/test/test_plistlib.py
	Lib/test/test_poplib.py
	Lib/test/test_posix.py
	Lib/test/test_posixpath.py
	Lib/test/test_pprint.py
	Lib/test/test_print.py
	Lib/test/test_property.py
	Lib/test/test_pty.py
	Lib/test/test_pyclbr.py
	Lib/test/test_pydoc.py
	Lib/test/test_queue.py
	Lib/test/test_raise.py
	Lib/test/test_random.py
	Lib/test/test_range.py
	Lib/test/test_re.py
	Lib/test/test_reprlib.py
	Lib/test/test_richcmp.py
	Lib/test/test_runpy.py
	Lib/test/test_sax.py
	Lib/test/test_sched.py
	Lib/test/test_scope.py
	Lib/test/test_select.py
	Lib/test/test_set.py
	Lib/test/test_shelve.py
	Lib/test/test_shlex.py
	Lib/test/test_shutil.py
	Lib/test/test_signal.py
	Lib/test/test_site.py
	Lib/test/test_smtpd.py
	Lib/test/test_smtplib.py
	Lib/test/test_smtpnet.py
	Lib/test/test_socket.py
	Lib/test/test_socketserver.py
	Lib/test/test_ssl.py
	Lib/test/test_string.py
	Lib/test/test_strlit.py
	Lib/test/test_strptime.py
	Lib/test/test_struct.py
	Lib/test/test_structseq.py
	Lib/test/test_subprocess.py
	Lib/test/test_sundry.py
	Lib/test/test_super.py
	Lib/test/test_sys.py
	Lib/test/test_sys_settrace.py
	Lib/test/test_sysconfig.py
	Lib/test/test_tarfile.py
	Lib/test/test_telnetlib.py
	Lib/test/test_tempfile.py
	Lib/test/test_textwrap.py
	Lib/test/test_thread.py
	Lib/test/test_threaded_import.py
	Lib/test/test_threading.py
	Lib/test/test_threadsignals.py
	Lib/test/test_time.py
	Lib/test/test_timeout.py
	Lib/test/test_tokenize.py
	Lib/test/test_trace.py
	Lib/test/test_traceback.py
	Lib/test/test_tuple.py
	Lib/test/test_types.py
	Lib/test/test_ucn.py
	Lib/test/test_unicode.py
	Lib/test/test_unicode_file.py
	Lib/test/test_unicodedata.py
	Lib/test/test_urllib.py
	Lib/test/test_urllib2.py
	Lib/test/test_urllib2_localnet.py
	Lib/test/test_urllib2net.py
	Lib/test/test_urlparse.py
	Lib/test/test_userlist.py
	Lib/test/test_userstring.py
	Lib/test/test_uuid.py
	Lib/test/test_wait3.py
	Lib/test/test_warnings.py
	Lib/test/test_weakref.py
	Lib/test/test_weakset.py
	Lib/test/test_winreg.py
	Lib/test/test_wsgiref.py
	Lib/test/test_xml_etree.py
	Lib/test/test_xml_etree_c.py
	Lib/test/test_xmlrpc.py
	Lib/test/test_xmlrpc_net.py
	Lib/test/test_zipfile.py
	Lib/test/test_zipfile64.py
	Lib/test/test_zipimport.py
	Lib/test/test_zipimport_support.py
	Lib/test/test_zlib.py
	Lib/test/testtar.tar
	Lib/test/threaded_import_hangers.py
	Lib/test/tokenize_tests.txt
	Lib/textwrap.py
	Lib/threading.py
	Lib/timeit.py
	Lib/tkinter/__init__.py
	Lib/tkinter/_fix.py
	Lib/tkinter/filedialog.py
	Lib/tkinter/font.py
	Lib/tkinter/simpledialog.py
	Lib/tkinter/ttk.py
	Lib/token.py
	Lib/tokenize.py
	Lib/trace.py
	Lib/traceback.py
	Lib/turtle.py
	Lib/types.py
	Lib/unittest/case.py
	Lib/unittest/loader.py
	Lib/unittest/main.py
	Lib/unittest/result.py
	Lib/unittest/test/__init__.py
	Lib/unittest/test/_test_warnings.py
	Lib/unittest/test/test_assertions.py
	Lib/unittest/test/test_case.py
	Lib/unittest/test/test_loader.py
	Lib/unittest/test/test_program.py
	Lib/unittest/test/test_skipping.py
	Lib/urllib/error.py
	Lib/urllib/parse.py
	Lib/urllib/request.py
	Lib/urllib/response.py
	Lib/uuid.py
	Lib/weakref.py
	Lib/webbrowser.py
	Lib/wsgiref/simple_server.py
	Lib/xdrlib.py
	Lib/xml/dom/__init__.py
	Lib/xml/dom/domreg.py
	Lib/xml/dom/expatbuilder.py
	Lib/xml/dom/minidom.py
	Lib/xml/dom/pulldom.py
	Lib/xml/etree/ElementTree.py
	Lib/xml/etree/cElementTree.py
	Lib/xml/parsers/expat.py
	Lib/xmlrpc/client.py
	Lib/xmlrpc/server.py
	Lib/zipfile.py
	cCameraManager.cpp
	deps/x86.winnt.msvc10/boost/libboost_chrono-vc100-mt-gd-1_52.lib
	deps/x86.winnt.msvc10/boost/libboost_date_time-vc100-mt-gd-1_52.lib
	deps/x86.winnt.msvc10/boost/libboost_prg_exec_monitor-vc100-mt-gd-1_52.lib
	deps/x86.winnt.msvc10/boost/libboost_program_options-vc100-mt-gd-1_52.lib
	deps/x86.winnt.msvc10/boost/libboost_system-vc100-mt-gd-1_52.lib
	deps/x86.winnt.msvc10/boost/libboost_test_exec_monitor-vc100-mt-gd-1_52.lib
	deps/x86.winnt.msvc10/boost/libboost_thread-vc100-mt-gd-1_52.lib
	deps/x86.winnt.msvc10/boost/libboost_unit_test_framework-vc100-mt-gd-1_52.lib
	deps/x86.winnt.msvc10/fltk/_fltkd.pdb
	deps/x86.winnt.msvc10/fltk/_fltkformsd.pdb
	deps/x86.winnt.msvc10/fltk/_fltkgld.pdb
	deps/x86.winnt.msvc10/fltk/_fltkimagesd.pdb
	deps/x86.winnt.msvc10/fltk/_fltkjpegd.pdb
	deps/x86.winnt.msvc10/fltk/_fltkpngd.pdb
	deps/x86.winnt.msvc10/fltk/_fltkzlibd.pdb
	deps/x86.winnt.msvc10/fltk/fltkd.bsc
	deps/x86.winnt.msvc10/fltk/fltkd.lib
	deps/x86.winnt.msvc10/fltk/fltkformsd.bsc
	deps/x86.winnt.msvc10/fltk/fltkformsd.lib
	deps/x86.winnt.msvc10/fltk/fltkgld.bsc
	deps/x86.winnt.msvc10/fltk/fltkgld.lib
	deps/x86.winnt.msvc10/fltk/fltkimagesd.bsc
	deps/x86.winnt.msvc10/fltk/fltkimagesd.lib
	deps/x86.winnt.msvc10/fltk/fltkjpegd.lib
	deps/x86.winnt.msvc10/fltk/fltkpngd.lib
	deps/x86.winnt.msvc10/fltk/fltkzlibd.lib
	elevatorSim.sln
	elevatorSim.vcxproj
	inc/FL/Fl_Device.H
	inc/Python/Python-ast.h
	inc/Python/Python.h
	inc/Python/abstract.h
	inc/Python/asdl.h
	inc/Python/ast.h
	inc/Python/bytesobject.h
	inc/Python/code.h
	inc/Python/codecs.h
	inc/Python/compile.h
	inc/Python/complexobject.h
	inc/Python/datetime.h
	inc/Python/descrobject.h
	inc/Python/dictobject.h
	inc/Python/dtoa.h
	inc/Python/errcode.h
	inc/Python/fileutils.h
	inc/Python/floatobject.h
	inc/Python/frameobject.h
	inc/Python/funcobject.h
	inc/Python/genobject.h
	inc/Python/graminit.h
	inc/Python/import.h
	inc/Python/intrcheck.h
	inc/Python/listobject.h
	inc/Python/longintrepr.h
	inc/Python/longobject.h
	inc/Python/memoryobject.h
	inc/Python/methodobject.h
	inc/Python/modsupport.h
	inc/Python/moduleobject.h
	inc/Python/node.h
	inc/Python/object.h
	inc/Python/objimpl.h
	inc/Python/opcode.h
	inc/Python/parsetok.h
	inc/Python/patchlevel.h
	inc/Python/py_curses.h
	inc/Python/pyconfig.h
	inc/Python/pydebug.h
	inc/Python/pyerrors.h
	inc/Python/pyexpat.h
	inc/Python/pymath.h
	inc/Python/pyport.h
	inc/Python/pystate.h
	inc/Python/pythonrun.h
	inc/Python/pythread.h
	inc/Python/pytime.h
	inc/Python/setobject.h
	inc/Python/structmember.h
	inc/Python/symtable.h
	inc/Python/traceback.h
	inc/Python/tupleobject.h
	inc/Python/ucnhash.h
	inc/Python/unicodeobject.h
	inc/boost/format/alt_sstream_impl.hpp
	makefile.x86.linux.gcc4.7
	makefile.x86.winnt.msvc2010
partially fix OS X build
removed win dep
build fixes for os x
added boost date_time workaround
removed glut includes which are not available on os x
added OS X specific glut header
Merge branch 'osx_only' of https://github.com/maxdeliso/elevatorSim into osx_only

Conflicts:
	cRenderObjs.hpp
	makefile.x86_64.darwin.clang3x
Merge remote-tracking branch 'remotes/origin/osx_only'