Pulling down changes from server from this morning

Pulling down changes from server from this morning and committing them.