Working version of EDevelopment and katelyn's branch
project builds and runs perfectly