added c1, c2, c3
renamed files
Merge branch 'alpha'
Merging files.
Merge branch 'dev'