Brought collision branch up to date

Squashed commit of the following:

commit dd1027525c5f57dc5ab5fb416d79b13c9bb51e33
Author: roglew <rglew56@gmail.com>
Date:   Sat Dec 21 14:50:00 2013 -0500

    Added support for animation definitions from xml files

    Squashed commit of the following:

    commit d42651ff2f5e12802001721faa1958f7825e4a05
    Author: roglew <rglew56@gmail.com>
    Date:   Sat Dec 21 01:56:11 2013 -0500

        Updated sprite_xml class to use generate_from_id to make animation

    commit 84bb95a5b59b4f44b1a6bbc269a1c509732486e1
    Author: roglew <rglew56@gmail.com>
    Date:   Sat Dec 21 01:54:44 2013 -0500

        Added generate_from_id to animation class

    commit 540d4d03dc0d14b5197ece0398b808747f1909b4
    Author: roglew <rglew56@gmail.com>
    Date:   Sat Dec 21 01:32:31 2013 -0500

        Fixed output formatting in update.py

    commit e7cdfcd8ded1b3f43fafbcf9065c96c4aab5fcfe
    Author: roglew <rglew56@gmail.com>
    Date:   Sat Dec 21 01:30:45 2013 -0500

        Moved enum predefinitions to ids.h, replaced AnimationStripConfig
        constructor with a function so that the struct can be initialized in
        place, fixed sprite_xml test to work correctly

    commit 8f2aa22a4264dd907bd0618403d4e202608d8395
    Author: roglew <rglew56@gmail.com>
    Date:   Sat Dec 21 01:30:20 2013 -0500

        Updated makefile for sprite_xml test to name binary correctly

    commit a893ae1dafc2da90f11aded3a63dafa264e3910e
    Author: roglew <rglew56@gmail.com>
    Date:   Sat Dec 21 00:09:02 2013 -0500

        update.py reads xml file properly

    commit 4ff90f5e20e884c7d25c8a8cc5125fef2eb5933e
    Author: roglew <rglew56@gmail.com>
    Date:   Fri Dec 20 16:27:27 2013 -0500

        Renamed AnimationConfig.count to AnimationConfig.frame_count

    commit 0cdb957455e49583c70a541d946b91f0675e9c06
    Author: roglew <rglew56@gmail.com>
    Date:   Fri Dec 20 16:17:00 2013 -0500

        Image is now stored in AnimationConfig to allow update.py to link images
        and animations

    commit f7a90e00ca199b2cb8afd7868dbb09f47273b93d
    Author: roglew <rglew56@gmail.com>
    Date:   Thu Dec 19 00:35:54 2013 -0500

        Started work on xml animations

    commit 0b39a2c13c9858bcecbf1ac407356f05106377dc
    Author: roglew <rglew56@gmail.com>
    Date:   Thu Dec 19 00:02:16 2013 -0500

        Added comments to update.py, created a basic sprite xml, started
        animation generation

    commit b36a656883b6e14052526ba84925454d47bdde46
    Author: roglew <rglew56@gmail.com>
    Date:   Tue Dec 10 17:16:45 2013 -0500

        Added .gitignore, allows .scratch files to be used for notes

    commit 37ef957568d733557413abe38ed71375db9df788
    Author: roglew <rglew56@gmail.com>
    Date:   Tue Dec 10 17:07:45 2013 -0500

        Created directory to test sprite XML data

commit 8effa1b58b6fc1fca6024051612bd2940b4d47d6
Author: roglew <rglew56@gmail.com>
Date:   Tue Dec 10 16:57:49 2013 -0500

    Added animation class, fixed bugs

    Squashed commit of the following:

    commit 27efa48043ab540d7563995fa02846115eb60c81
    Author: roglew <rglew56@gmail.com>
    Date:   Tue Dec 10 16:51:02 2013 -0500

        Forgot the image in the test

    commit 8b3e5428b5912cabf0237f7658343721edd5ba17
    Author: roglew <rglew56@gmail.com>
    Date:   Tue Dec 10 16:50:36 2013 -0500

        Created animation test, fixed problem with sprites not cropping

    commit ef9e239a4e98bce7edbb0f86a4cae8fed6127100
    Author: roglew <rglew56@gmail.com>
    Date:   Mon Dec 9 20:01:37 2013 -0500

        Removed debug output

    commit 6a8b1038e675fb50d6cf3048d27411bdc7aa8f21
    Author: roglew <rglew56@gmail.com>
    Date:   Mon Dec 9 20:00:37 2013 -0500

        Don't know why this fixed the segfault at the end, but it did. Should
        watch for memory leaks when destroying objects

    commit 5d1cb2ecb3074d07e922feceb0abaafe28c8aadb
    Author: roglew <rglew56@gmail.com>
    Date:   Mon Dec 9 18:59:52 2013 -0500

        No more segfaults!

    commit a627f35c489fe450bef46187dda816448654ba50
    Author: roglew <rglew56@gmail.com>
    Date:   Mon Dec 9 15:54:38 2013 -0500

        Fixed compiler warnings

    commit 66763d3e05aa85f79871cb20d98a03427864aee5
    Author: roglew <rglew56@gmail.com>
    Date:   Sat Dec 7 22:57:38 2013 -0500

        Working on finding a segfault

    commit 0ff31216671fecab16a1b55435829a3adfe82314
    Author: roglew <rglew56@gmail.com>
    Date:   Sat Dec 7 22:57:08 2013 -0500

        Updated makefiles to -Wall, will work through warnings later

    commit b3c293de2a9cc8fe49fd21b3bd92168fa5d37c6f
    Author: roglew <rglew56@gmail.com>
    Date:   Sat Dec 7 22:09:50 2013 -0500

        Object files compile correctly

    commit a101c6f519d47f60b2f2b7665d73c1d15ca5296d
    Author: roglew <rglew56@gmail.com>
    Date:   Sat Dec 7 21:43:17 2013 -0500

        Updated GameObject to use new animations

    commit 036c07b26230376cdc78620a1f5c9906a9544d44
    Author: roglew <rglew56@gmail.com>
    Date:   Sat Dec 7 21:33:00 2013 -0500

        Added implementation for animation

    commit 121bb77c825bbd57f2317cb1280bdecd96f016e1
    Author: roglew <rglew56@gmail.com>
    Date:   Sat Dec 7 20:56:17 2013 -0500

        Formatted animation.cpp

    commit 11cd1784ba09e830effb8bf7d598d809b803f1f0
    Author: roglew <rglew56@gmail.com>
    Date:   Sat Dec 7 20:35:18 2013 -0500

        Moved enum predefinitions to ids.h

    commit ecf733d7dbfc4044697945ba571a58e35398f81f
    Author: roglew <rglew56@gmail.com>
    Date:   Sat Dec 7 20:32:03 2013 -0500

        Updated header for animation create_from_strip

    commit a823affc418166923e51a0bb49bdcfea9507fa4b
    Author: roglew <rglew56@gmail.com>
    Date:   Thu Dec 5 17:17:53 2013 -0500

        Started animation.h

    commit 6882e92d283f69adad11cc554eb5c23b7f1d11c0
    Author: roglew <rglew56@gmail.com>
    Date:   Thu Dec 5 17:08:36 2013 -0500

        Created animation files

commit b72d05fd5bfe0d5507d003a7fd12eff2ea5c0e4d
Author: roglew <rglew56@gmail.com>
Date:   Thu Dec 5 17:07:31 2013 -0500

    Squashed commit of the following:

    commit babf231f8a04280523ff2364f3f47f0fc53c1d11
    Author: roglew <rglew56@gmail.com>
    Date:   Thu Dec 5 17:04:56 2013 -0500

        Sprite class no longer has "loaded" value since update_texture handles loading

    commit 2dfe9b9f2471a7625f868653a97fe43f37c83ea8
    Author: roglew <rglew56@gmail.com>
    Date:   Thu Dec 5 16:53:43 2013 -0500

        Simplified setting the image of a sprite

    commit a7dfacfb711a85429038767c669b425c8ced0e18
    Author: roglew <rglew56@gmail.com>
    Date:   Thu Dec 5 16:53:23 2013 -0500

        Added basic int square struct

commit a402e6b9871ac5c26678a02103c4985e8ebde249
Author: roglew <rglew56@gmail.com>
Date:   Wed Oct 16 20:18:00 2013 -0400

    Added readme for github

commit 005e44ff2def605de3dcdc76c690e675d2b0c6b8
Author: roglew <rglew56@gmail.com>
Date:   Tue Oct 15 17:26:57 2013 -0400

    Squashed commit of the following:

    commit f3aac0ad65cda8b8c992d3f20b282d4342a0d0ca
    Author: roglew <rglew56@gmail.com>
    Date:   Tue Oct 15 17:25:40 2013 -0400

        Object manager test compiles and works

    commit 10013ad2b535ee1e2ddd50d2ad20df59ee62882b
    Author: roglew <rglew56@gmail.com>
    Date:   Tue Oct 15 17:14:20 2013 -0400

        Object files compile, emotionally preparing for segfaults

    commit 8b65b1073e309a2e89aa08323ca75a1dddc390ca
    Author: roglew <rglew56@gmail.com>
    Date:   Tue Oct 15 16:38:22 2013 -0400

        objectmanager doesn't use templates, changed hpp to h

    commit 4c284dd626c121f199047a330fcad677761862bd
    Author: roglew <rglew56@gmail.com>
    Date:   Tue Oct 15 16:35:02 2013 -0400

        Game object manages game loop. I really don't want to test this

    commit ecda2cc7cb66d545a33ea0acd78d9f86f9d19703
    Author: roglew <rglew56@gmail.com>
    Date:   Tue Oct 15 15:37:20 2013 -0400

        forgot objectmanager.hpp

    commit f45612c25a5f8312cc9070b3f9824668227102a2
    Author: roglew <rglew56@gmail.com>
    Date:   Tue Oct 15 15:36:32 2013 -0400

        First draft of work on the object manager, created test directory BROKEN
        AS FUCK!

    commit 19ccae89efce8d1bee6278c9d1817c7e6f269247
    Author: roglew <rglew56@gmail.com>
    Date:   Mon Oct 14 23:34:30 2013 -0400

        A bit of work on object manager implementation. Ice cream time.

    commit 8691b52d884ea7977aaef172e8aa5b64754cf1a7
    Author: roglew <rglew56@gmail.com>
    Date:   Mon Oct 14 23:20:18 2013 -0400

        Objects' process_event() now takes a Game as an argument

    commit f3fe3f9180e5624698ae5aecc0524d6058dce4a4
    Author: roglew <rglew56@gmail.com>
    Date:   Mon Oct 14 23:07:26 2013 -0400

        Created game class to keep game parts together

    commit ca60faa464b982a95e89ab3bfc7ce52f18744f5b
    Author: roglew <rglew56@gmail.com>
    Date:   Sun Oct 13 17:34:38 2013 -0400

        Added object management test. Copied resource_org

commit 15ae87909100f2fd7e26c8a8f7a5c4729bafb559
Author: roglew <rglew56@gmail.com>
Date:   Sat Oct 12 18:48:48 2013 -0400

    I think I merged most of resource_org to development?

commit 0baab5962aadfc23273e40ff973681fbaddd5ebc
Author: roglew <rglew56@gmail.com>
Date:   Fri Oct 11 18:46:50 2013 -0400

    Added collisiontest.cpp

commit 393dc29b4ae566777e3afef2ec3a217e2e4628a5
Author: roglew <rglew56@gmail.com>
Date:   Fri Oct 11 18:30:00 2013 -0400

    Added comments to resource_arg makefile

commit 42c230f74cc6521bfb7683b7c2135f63acd7524b
Author: roglew <rglew56@gmail.com>
Date:   Fri Oct 11 18:24:47 2013 -0400

    Modified includes in resource_org test

commit 0424e635e142ce3df9e18bff95e55ae0f87fb17a
Author: roglew <rglew56@gmail.com>
Date:   Fri Oct 11 17:48:07 2013 -0400

    No idea what 'prog' was or how it got there

commit 23ced410707a246716ea764a01cb421eaa5f35d9
Author: roglew <rglew56@gmail.com>
Date:   Fri Oct 11 17:44:59 2013 -0400

    Converted tabs to spaces

commit 435d794aa01f1e93a47c58cef1270308973fe768
Author: roglew <rglew56@gmail.com>
Date:   Fri Oct 11 17:38:59 2013 -0400

    fixed resourceorg test main.cpp

commit d227443d367f3d5effee12e5b1eb56dbdcd872ab
Author: roglew <rglew56@gmail.com>
Date:   Fri Oct 11 17:38:18 2013 -0400

    Updated resourceorg test makefile

commit 2e4f94f5538768a583bdc9be817e85f8e1fac0eb
Author: roglew <rglew56@gmail.com>
Date:   Fri Oct 11 17:28:44 2013 -0400

    Make can generate all the .o files now

commit 255d36f9bf81a821a314c775aa2cedc42b28700d
Author: roglew <rglew56@gmail.com>
Date:   Fri Oct 11 16:57:36 2013 -0400

    Made resource_org test use the engine

commit 0f32870618e025d865ba901e738fefefbad3ea0b
Author: roglew <rglew56@gmail.com>
Date:   Fri Oct 11 16:57:13 2013 -0400

    Updated makefile

commit e34b586a993c579afa7c88bbfc28894b0da9daf7
Author: roglew <rglew56@gmail.com>
Date:   Fri Oct 11 16:02:51 2013 -0400

    Engine compiles with -I flag instead of symlinks

commit e8c2abd07e8646afc8a406e668837478f1a41d88
Author: roglew <rglew56@gmail.com>
Date:   Tue Jul 30 11:49:56 2013 +0200

    Updated makefile, resource finder, moved main.cpp to src/

commit db6312505a68c25d493a5cf8a91d101264a9629a
Author: roglew <rglew56@gmail.com>
Date:   Tue Jul 30 11:19:26 2013 +0200

    Made makefile, added to resource header load func for IMG_X

commit ed683a52a7b77b921839f48b1a6e739a39f83f98
Author: roglew <rglew56@gmail.com>
Date:   Wed Jun 26 16:13:58 2013 +0200

    First draft of the resource manager, not tested

commit 357cad174454e12ac2bb0bbab31db6f78cb3a126
Author: roglew <rglew56@gmail.com>
Date:   Tue Jun 25 12:26:00 2013 +0200

    Created python script to generate header to match resources to enums

commit 326af100b2ec7fee8cfbab3615e337ca9411934a
Author: roglew <rglew56@gmail.com>
Date:   Mon Jun 24 15:43:00 2013 +0200

    Added more to base project

commit a0c2cdf42d86aef132092661e8570bf1c822afec
Author: roglew <rglew56@gmail.com>
Date:   Mon Jun 24 15:41:33 2013 +0200

    Created empty template on how I want games organized
Created folder for collision tests
Implemented collides(Collision, Collision)
Renamed folder, implemented Sprite::collides(Sprite&). It compiles. Yay.