messing with ui
resolving conflicts
fixed ui. LOTs of work to do here
added controllers and models and stuff and other stuff. Not sure the validity
Merge pull request #12 from thesubtlety/breaking-shit

Ok I trust you know what you are doing...