PHOENIX update
Merge branch 'master' of https://github.com/elliottm/Super_craic
got rid of the ul tags for p tags
Merge branch 'master' of https://github.com/elliottm/Super_craic