Changes for merge

- Removed conflicting build files
- Moved @author tags
This commit is contained in:
Matt C 2016-12-06 20:20:27 +00:00
parent 605a577d92
commit b36459064e
5 changed files with 3 additions and 724 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long