first
Merge branch 'master' of https://github.com/Sacarianos/TechStorm-Rails
Semi-almost final commit