last changes
merge

Merge branch 'master' of github.com:trustdarkness/righthererightnow