consolidated files
Merge branch 'master' of github.com:2014DaemonDash/castle