Added 137f.
Bug fix: bracelet lines could switch order.
Added 137 b and c, also second mockup to 137f.
Added 138 bcf.
added class notes to GitHub
Edited notes
Did class assignment
Completed class assignment
two rows of index hard-coded
some dynamic coding
more dynamic content
Finished!
Finished!
Completed first step
Merge branch 'master' of github.com:davincicoders/2013-q3-rails-1
Merge branch 'master' of github.com:pcaspen/2013-q3-rails-1

Conflicts:
	class_notes.docx