wint-99 Merge

Squashed commit of the following:

commit 03d2fbf83977be66bb4e477625676c41f13fe612
Merge: 556c82b c70cfcb
Author: mruckman <nospam2008@mruckman.com>
Date:   Sat Oct 12 15:20:35 2013 -0700

    Merge branch 'wint-99' of https://github.com/mruckman/git-training into wint-99

commit 556c82b26161e0a4a9eef874f2628ad81e1b69d0
Author: mruckman <nospam2008@mruckman.com>
Date:   Sat Oct 12 15:18:49 2013 -0700

    wint-99 feature set

commit c70cfcb9032b271b8f2df057530a4ba8e5175e41
Author: mruckman <nospam2008@mruckman.com>
Date:   Sat Oct 12 15:18:00 2013 -0700

    test

commit 047cf20375a7eacbff002e24a46085bcef9b78f9
Author: mruckman <nospam2008@mruckman.com>
Date:   Sat Oct 12 15:17:15 2013 -0700

    test-me