Committing before pulling
Merging with myself
removing warnings