Merge conflict
Read ME
Merge branch 'gh-pages' of https://github.com/Shadae/adies_dash into gh-pages
First Commit