Initial commit
finshed
edited buttons
finishing touches
Merge branch 'dev'
Merge branch 'master' into gh-pages
finishing touches