Rearranging and such
Merge branch 'master' of github.com:aabmass/luckybraids