Rejoined fx branch to master branch

Master should now contain the most updated version of the project, from
the spacefx branch