Merging stash, resolved db connex conflict
Added logic on frontend to look for API at current host, on api port provided. So when its local it looks on localhost, when its on JJGym, it looks at http://jjgym.com