added button
Merge branch 'master' into chr

Conflicts:
	PostUpNow/index.html
Merge branch 'chr'