Proper buttons in merge (with Save/Ignore updates)
updated fontello font to just two icons used
sample demo test update (partials test)
removed fontello and replaced icons with new ones
Merge branch 'master' into its-friday
Merge pull request #25 from amida-tech/its-friday

Its friday