Merge pull request #3 from wannabefro/amanda

Amanda
Merge branch 'master' of https://github.com/wannabefro/BAMC into amanda
Merge pull request #4 from wannabefro/amanda

better admin beats page
Merge branch 'master' of https://github.com/wannabefro/BAMC into amanda