added migrations'
added display of new attributes
added || nil to the index display to prevent error out
messing with clock
merging thumbs to master