Added beginnings of button template
* Webstorm and mac
* fixed merge errors
Merge branch 'master' of github.com:afuhrtrumpet/meteorhack14 into ben
mrt add underscore
Merge branch 'ben' of github.com:afuhrtrumpet/meteorhack14
added icons