initial project version
added all the stuff i missed
Merge branch 'master' of github.com:djpalmer88/first
Merged files for some reason, I confuse.