cleaning house
Merge branch 'master' of github.com:jaluce/Like-A-Rock
Merge branch 'master' of github.com:jaluce/Like-A-Rock