added history page
Merge branch 'master' of https://github.com/soltran/coinmo
fixed buttons smushing
fix navbar
fixed merge issues
 fixed controller merge issue
Merge branch 'master' of https://github.com/soltran/coinmo