Facebook buttons and further testing
Concluding merge
HAML Glory
HAML Glory Conflict Resolution
Merge pull request #9 from jamesjenkinsyates/master

HAMLised and Glory