git init
Merge branch 'drkyro' into thedigit
v
association testing
link to book form subject
ok ok depinga
 some ui stuff
Merge branch 'thedigit' into drkyro
ignore
Merge branch 'drkyro'

Conflicts:
	Gemfile.lock