Merge pull request #1 from collegeteamAS/working

Working
edit 1

first
fix