Small stuff
Merge branch 'master' of https://github.com/CSE512-14W/fp-ljorr1-jortiz16

Conflicts:
	interaction_collapse.js
Small stuff for sizing