First commit
Merge https://github.com/lopezLynx/firstproj