padding

using by <div class="col-md-1"></div>
padding

using by col
Merge branch 'master' of https://github.com/ctzsm/HCI_prototype

Conflicts:
	activity-launch.html