Merge pull request #1 from Pickra/master

final framework still needs lots of detail adjustments
Merge pull request #4 from Pickra/adjustments

making it go
Merge pull request #5 from Pickra/gh-pages

totally lost at this point. just wanna push from local. iterm says i gota pull, then wont let me so im tryn merge.