testing2...
Merge branch 'master' of https://github.com/nunezro2/ShoutOutAws.git
Including what is needed for our server side. Also changing user by
shout.