Update 1 (11-14-13)

A quick commit so I can switch branches and do something on master