Class Notes
Merge branch 'master' of https://github.com/nasser/dtplayfulsystems
2/16/14

deleating some files
My last changes
functions HOMEWORK

This is a remake of my fractal code but using a single function instead.
set
Merge branch 'master' of https://github.com/nasser/dtplayfulsystems

Conflicts:
	Gabi
Patacsil/geometricLinesHW_0219/bin/emptyExampleDebug.app/Contents/MacOS/
emptyExampleDebug
GENES HW4
-
Updates
others
Merge branch 'master' of https://github.com/fitosegrera/dtplayfulsystems

Conflicts:

fitosegrera/functions_homework/bin/functions_homeworkDebug.app/Contents/
MacOS/functions_homeworkDebug

fitosegrera/functions_homework/functions_homework.xcodeproj/project.pbxp
roj

fitosegrera/functions_homework/functions_homework.xcodeproj/project.xcwo
rkspace/xcuserdata/fito_segrera.xcuserdatad/UserInterfaceState.xcusersta
te
Merge branch 'master' of https://github.com/nasser/dtplayfulsystems
added homework week 4 and 5
new updates
new sin wave homework assignment
Merge pull request #56 from joselynNeon/master

new sin wave homework assignment
hw3/5

hw3/5
Merge pull request #57 from shinylee/master

hw3/5
Merge pull request #54 from fitosegrera/master

SlidingAlongLines / fito_segrera