4 commits

Author	SHA1	Message	Date
Noah Moroze	753adc4c65	fixed merge conflict, adjusted width of block	2014-05-17 14:08:09 -04:00
Michael Yang	4e5d93b31f	with noah, fixed clock rotation	2014-05-17 12:57:48 -04:00
Noah Moroze	106edd1489	Fixed mod arithmetic	2014-05-17 12:41:54 -04:00
Noah Moroze	fc193d0519	yes	2014-05-17 12:16:56 -04:00