commiting uncommited changes since last month, some basic changes
Merge branch 'master' of github.com:pagrawl3/Launchpad