Completes Makefile
Merge branch 'master' of github.com:ricardo-diaz-92/shoutroom