Changed file
merge conficts
fixed script
Merge branch 'master' of https://github.com/CampusHacks/Smads