jacobsalmela 928072eecc Merge branch 'master' into installation ... # Conflicts: # automated install/basic-install.sh # gravity.sh		2016-01-18 21:26:47 -06:00
..
basic-install.sh	Merge branch 'master' into installation	2016-01-18 21:26:47 -06:00
uninstall.sh	fixes #169	2016-01-16 14:10:03 -06:00