messages
resolve conflict
messages
Merge pull request #3 from kasabian/release_2

Release 2