Pulling
Merge branch 'master' of https://github.com/sbirch/cs195w-atus
Merge branch 'master' of https://github.com/sbirch/cs195w-atus
Merge branch 'master' of https://github.com/sbirch/cs195w-atus
Merge branch 'master' of https://github.com/sbirch/cs195w-atus
Merge branch 'master' of https://github.com/sbirch/cs195w-atus
Merge branch 'master' of https://github.com/sbirch/cs195w-atus
Merge branch 'master' of https://github.com/sbirch/cs195w-atus
Merge branch 'master' of https://github.com/sbirch/cs195w-atus
Merge branch 'master' of https://github.com/sbirch/cs195w-atus
Merge branch 'master' of https://github.com/sbirch/cs195w-atus
Added settings feature for atus.py