Commiting the work the interns have done during last summer at the pope's request. Even though the functionality works fine, I cannot state I'm fine with the way it's been implemented. And they were always drinking all our coffee and messing around with the chairs in the office.
Merge pull request #12 from ancagrosan/master

yet another merge