First code set from Space Apps weekend
Merge branch 'master' of https://github.com/ve4edj/spaceapps2014

Pushing local code onto git