Added links related to Google Glass
Added my name as suggested in the "Contributing" section
fixed conflict in authors
Fixed merge conflicts