Commit of a Stash

Keep getting weird problems with the following files:
war\WEB-INF\appengine-generated\datastore-indexes-auto.xml
war\WEB-INF\classes\com\clashroom\client\FlowControl.class

No clue what the deal is because I didn't change anything in these files.
Decided to checkout the above files to stop the merge of those changes