changes
Merge branch 'master' of https://github.com/GetaGun/Forum-slr-2014