set up
fixing merge issues
Merge branch 'master' of github.com:Harrisam/hen_party

 i hope i am not breaking anyhting :).