Merging text

Editing out the merge-message
Merge branch 'master' of https://github.com/sgnl02/AN into grunt