pushing for Zekes to look over my horrible work

Signed-off-by: Jamini <mobiousjami@gmail.com>
Merge branch 'master' of https://github.com/Jamini/NEVUnity

Conflicts:
	nano/templates/astronav.tmpl

Signed-off-by: Jamini <mobiousjami@gmail.com>