Added all of the awesome

User inputed new line
Merge branch 'master' into gh-pages