Fixed the merge with the changing folder structure.
Merge branch 'master' of https://github.com/jnshi/6784project

Conflicts: