some config shit
shit
merge conflict sorted
Rigistration/Login functionallity working. Still requires refinment - tidy up - lang, views etc