Ignoring library files
Resolving conflict on gitignore, removing lib files and wrong dirs

Merge branch 'master' of https://github.com/spaceconcordia/watch-puppy

Conflicts:
	.gitignore