removed main check not needed
combined with changes to the billiard fork this works now.
adding freeze support import for non darwin os
Merge branch 'master' into mac_os_multiprocessing_patch

Conflicts:
	pupil_src/capture/main.py
making version fetching more robust.
added feature on mac side
adding capture selector on linux side
small fix in imports
Merge branch 'mac_os_multiprocessing_patch'
Merge branch 'mac_os_multiprocessing_patch'
Merge branch 'master' into selectable_capture
adding resolution filter for cameras
small name change
made the sleep in the startup phase conditional on platform
put circle marker detector into sep module. added small tweak to improve false positive rate.
added marker color detection
cosmetic fix
Attempting to put tables in the readme so it will look like the wiki.
smaller images so table formatting isn’t messed up.
forgot <table> tag and changed header of section.