~joshrig/orbits

Merge branch 'develop'
exclude the build folder, idiot
initial import
Do not follow this link