pulled from my mac air
changed file location
Merge branch 'master' of https://github.com/Teaflavored/App_Academy_Work into side

Conflicts:
	W1D1/N-queens.rb