add dev dependencies
Merge branch 'master' of https://github.com/taylorharwin/space-station

Resolving conflicts