startin to build the fron end stuff
Uploading partial update to angular-ui routing
Merged something that went weird