General update #1
General Update #1
Merge remote-tracking branch 'origin/master'
Fixed eclipse issue, added random line so it didn't yell at me.