Failsaves
Merge branch 'master' of https://github.com/HazCod/Quackr

Conflicts:
	js/model.js
Removed js folder in lib
Merge remote-tracking branch 'upstream/master'