# This is a combination of 3 commits.
# The first commit's message is:
Add constructor classes

# This is the 2nd commit message:

Add class tests

# This is the 3rd commit message:

Add tests for instances
Merge branch 'master' into class-merge

Conflicts:
	public/js/100-specs.js
	public/js/class-definitions.js
Rebuild tests
Merge branch 'class-merge'
Merge branch 'master' of github.com:devleague/100-Specs

Conflicts:
	public/js/class-definitions.js