images and codes
macro to macros
Merge branch 'commandsets' of https://github.com/frankbaffle/cs279-hw2 into commandsets

Conflicts:
	static/js/app/data/CommandSet1.js
Merge branch 'commandsets' of https://github.com/frankbaffle/cs279-hw2 into commandsets
merge.