Added .project to .gitignore
Testing commit (added space to file)
Reverted test space.
Test blah.txt file to see what happens when I checkout a different
branch.
Removed test file.
Merge branch 'master' into development
Merge remote-tracking branch 'origin/master' into development
Added block_info hook to foodisfree_blocks module.
Merge remote-tracking branch 'origin/master'