hmm
fixd stuff
Merge branch 'dev' of file:///home/kook/sec_shit