Fixed error 500, still need to fix something realated to join
Merge branch 'master' of github.com:rreimi/jynx