Squashed commit of the following:

commit acf67a8c1c1b4efca4f27e4d0803c4b71288b34f
Author: Johan Wallin <johan.wallin@comhem.com>
Date:   Wed Nov 27 15:48:53 2013 +0100

    Added another file

commit 3fa3dc7df61ce6e7791c5bc288cd43077298f54e
Author: Johan Wallin <johan.wallin@comhem.com>
Date:   Wed Nov 27 15:47:17 2013 +0100

    Added new file