Merge branch 'fixformatting'

pull/557/merge
danroth27 2015-10-28 00:21:09 -07:00
commit bcca492fd3
1 changed files with 2 additions and 2 deletions