fdsa
Merge branch 'master' of http://github.com/lilshim/macro

Conflicts:
	templates/index.html
buttons