Merge pull request #11 from Kjven/master

pull master to calvin
changeset #13 will continute tomorrow
Merge branch 'calvin' of https://github.com/Cyrois/eece310_app
Merge branch 'calvin'