Merge pull request #13 from PLopezD/master

Merge pull request #2 from unknownbreaker/master
manually dealt with all merge conflicts between button styles and layout styles
experimenting with merge from rob_v6
attempting to fix merge conflicts
deleted all the original master files on my local; copied and pasted files from rob_v7 branch in its place