Pushing functional build of system
Merge branch 'master' of http://github.com/ajl2612/fip2013