Yaminick/Pocket-Campus-Slate — pull request #1 by Yaminick (2013-11-09 18:56:45+00:00)
Title: test pull request

This should be the same as merging master into jason I think?