ui rehaul
Merge branch 'dev' of file:///home/kook/sec_shit

Conflicts:
	intro.txt