Initial commit
Initial commit
Merge branch 'master' of https://github.com/38DaysLater/SpaceTrader
resolving net beans problem
Wrong project type
Initial commit part 2
Menu making - Hutchinson
Menu making 1.1- Hutchinson
Olivia changed loading screen
Olivia updated Controller class for loading screen
Olivia added background image to resources folder
Olivia added background image to resources folder
Merge origin/master

Conflicts:
	SpaceTrader/nbproject/project.properties
why git, why
I'll show you git!
Olivia updated to java 8, changed fxmldoc
Merge origin/master

Conflicts:
	.gitignore
Olivia changed background on looding screen
ControlsFX
Simple dialog test