Set the IP to my laptop, so we can use it directly during development
Merge remote-tracking branch 'origin/master'