Remade ERM from scratch based on new mockups
Merge branch 'work' of github.com:IAP12-16B/jManagr into work
Recommit changes to ERM due to merge (want to be sure nothing is getting lost